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

Set the minimum Qt version to 4.7. 

We've been using QElapsedTimer for a while now with no complaints. It
was introduced in Qt 4.7, which was first released in September 2010.

Change-Id: I21ca768c6a7bab8a08626957583d81fd771c64b4
Reviewed-on: https://code.wireshark.org/review/10732
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-10-01 10:36:22 -07:00
parent 77a9181882
commit cc9de69b49
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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()

2
README.bsd
View File

@ -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/

2
configure.ac
View File

@ -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.

2
doc/README.qt
View File

@ -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 .