Qt 5.2.1 for Mac has QtMacExtras but not QMacNativeToolBar.

Change-Id: I55e68a7fd84d36b50e6084cd82b51df7c91c6476
Reviewed-on: https://code.wireshark.org/review/159
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>

diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index d3e08a2c0d2eec9a7d7cf7e87518ad5679827ca8..6ad53166731b982632420507cf4606b510c3b8d0 100644 (file)
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -64,7 +64,7 @@
 #include <QToolButton>
 #include <QTreeWidget>
 
-#ifdef QT_MACEXTRAS_LIB
+#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)
-#ifdef QT_MACEXTRAS_LIB
+#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