From 2a5618b5d1c8df3b50310dcdfeadd9a2d7ae5fb3 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Mon, 10 Feb 2014 11:56:53 -0800 Subject: [PATCH] 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 Tested-by: Gerald Combs --- ui/qt/main_window.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index d3e08a2c0d..6ad5316673 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -64,7 +64,7 @@ #include #include -#ifdef QT_MACEXTRAS_LIB +#if defined(QT_MACEXTRAS_LIB) && QT_VERSION <= QT_VERSION_CHECK(5, 2, 1) #include #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