diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | README.bsd | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/README.qt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ec767c633..753b00cd38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -674,7 +674,7 @@ if(BUILD_wireshark) set(QT_VERSION 5) else() set(PACKAGELIST ${PACKAGELIST} Qt4) - # set(Qt4_OPTIONS 4.7.1 REQUIRED QtCore QtGui) + set(Qt4_OPTIONS 4.7.1 REQUIRED QtCore QtGui) set(QT_VERSION 4) endif() endif() diff --git a/README.bsd b/README.bsd index e2f10c805b..09f636afe3 100644 --- a/README.bsd +++ b/README.bsd @@ -32,7 +32,7 @@ If you want to use the Wireshark GUI, install one or both of these toolkits: ftp.gnome.org:/pub/gnome/sources/gtk+/ http://ftp.gnome.org/pub/gnome/sources/gtk+/ - Qt 4.6 or later: + Qt 4.7 or later: http://download.qt-project.org/official_releases/qt/ diff --git a/configure.ac b/configure.ac index c0632e4c94..d1de15d3ce 100644 --- a/configure.ac +++ b/configure.ac @@ -1559,7 +1559,7 @@ GTK2_MIN_VERSION=2.12.0 AC_SUBST(GTK2_MIN_VERSION) GTK3_MIN_VERSION=3.0.0 AC_SUBST(GTK3_MIN_VERSION) -QT_MIN_VERSION=4.6.0 +QT_MIN_VERSION=4.7.0 AC_SUBST(QT_MIN_VERSION) # GTK+ and Qt checks; we require GTK+ $GTK2_MIN_VERSION or later or # GTK3_MIN_VERSION or later or Qt $QT_MIN_VERSION or later. diff --git a/doc/README.qt b/doc/README.qt index 544ff563b2..d14157539b 100644 --- a/doc/README.qt +++ b/doc/README.qt @@ -11,7 +11,7 @@ and let us add features more easily. 1. Getting up and running The Qt interface for Wireshark should compile out of the box on Windows, OS -X, and Linux using Qt 4.6 or later (including Qt 5) and Visual C++, gcc/g++, +X, and Linux using Qt 4.7 or later (including Qt 5) and Visual C++, gcc/g++, and clang/clang++. The Qt UI is continuously built and tested at https://buildbot.wireshark.org/trunk/waterfall . |