aboutsummaryrefslogtreecommitdiffstats
path: root/acinclude.m4
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-11-18 16:21:42 -0800
committerGerald Combs <gerald@wireshark.org>2014-12-09 21:25:33 +0000
commit4921e559906aee70c4665f1c739057e227787e01 (patch)
tree4465cb9e9de152bfb57f00852e437994e2d85cd9 /acinclude.m4
parent3147087de323c0294b51006f97b641fc408f1b06 (diff)
Qt: Initial VoIP Calls dialog.
Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at the top, since that seems to be the primary item. Add configure-time checks for QtMultimediaWidgets in anticipation of adding a VoIP playback dialog. Add an icon for the playback button. (Yes, I've been avoiding GNOME-level gratuitous icons so far but this is one of the rare occiasions where it makes sense.) Add a help link define for the VoIP calls dialog. Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050 Reviewed-on: https://code.wireshark.org/review/5674 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m47
1 files changed, 7 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 4b89b35dd3..47457f634b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2122,6 +2122,13 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK],
AC_WIRESHARK_QT_MODULE_CHECK(PrintSupport, $1)
#
+ # Qt 5.0 added multimedia widgets in the Qt
+ # MultimediaWidgets module.
+ #
+ AC_WIRESHARK_QT_MODULE_CHECK(MultimediaWidgets, $1,
+ AC_DEFINE(QT_MULTIMEDIAWIDGETS_LIB, 1, [Define if we have QtMultimediaWidgets]))
+
+ #
# While we're at it, look for QtMacExtras. (Presumably
# if we're not building for OS X, it won't be present.)
#