osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt 5.0 appears to move the widgets out of Qt GUI to Qt Widgets; look for 

QtWidgets and, if we find it, add its flags to CFLAGS and CXXFLAGS, so
that we find the include files for the widgets.  (If we don't find it,
we assume it's Qt 4.)

svn path=/trunk/; revision=46382
This commit is contained in:
Guy Harris 2012-12-04 23:37:49 +00:00
parent e5379cd38b
commit ef3d42ad74
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure.ac
View File

@ -834,6 +834,20 @@ if test "x$enable_wireshark" = "xyes"; then
AC_MSG_ERROR([Qt is not available])
])
#
# Qt 5.0 appears to move the widgets out of Qt GUI
# to Qt Widgets; look for QtWidgets and, if we find
# it, add its flags to CFLAGS and CXXFLAGS, so that
# we find the include files for the widgets. (If
# we don't find it, we assume it's Qt 4.)
#
PKG_CHECK_MODULES([QtWidgets], [QtWidgets],
[
CFLAGS="$CFLAGS $QtWidgets_CFLAGS"
CXXFLAGS="$CXXFLAGS $QtWidgets_CFLAGS"
],
[])
#
# We don't know whether we have GTK+, but we
# won't be using it, so it's as if we don't