osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a Qt version comparison. 

Change-Id: I7df90d53a2d8f29042994bd0c2bc7bf4450fab10
Reviewed-on: https://code.wireshark.org/review/177
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-02-11 11:45:30 -08:00 committed by Gerald Combs
parent edc06c17e7
commit 648769497a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/main_window.cpp
View File

@ -64,7 +64,7 @@
#include <QToolButton>
#include <QTreeWidget>
#if defined(QT_MACEXTRAS_LIB) && QT_VERSION <= QT_VERSION_CHECK(5, 2, 1)
#if defined(QT_MACEXTRAS_LIB) && QT_VERSION < QT_VERSION_CHECK(5, 2, 1)
#include <QtMacExtras/QMacNativeToolBar>
#endif
@ -160,7 +160,7 @@ MainWindow::MainWindow(QWidget *parent) :
#endif
#if defined(Q_OS_MAC)
#if defined(QT_MACEXTRAS_LIB) && QT_VERSION <= QT_VERSION_CHECK(5, 2, 1)
#if defined(QT_MACEXTRAS_LIB) && QT_VERSION < QT_VERSION_CHECK(5, 2, 1)
QMacNativeToolBar *ntb = QtMacExtras::setNativeToolBar(main_ui_->mainToolBar);
ntb->setIconSize(QSize(24, 24));
#endif // QT_MACEXTRAS_LIB