diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-07-10 16:06:59 -0700 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-07-11 06:02:28 +0000 |
| commit | d0cd357825a7c5ad9dc68d36516ca0ce5317ce9c (patch) | |
| tree | 0a2a6f42fca52761cbfa302f4774250b89e4338e /ui | |
| parent | 584569932b066fb4cc2f2c533743bf5c58c8c076 (diff) | |
Qt: Remove some dead code.
We no longer support Qt 5.2 or earlier.
Change-Id: I94ba6df2120956dadfce407fd999d39250485bc6
Reviewed-on: https://code.wireshark.org/review/37821
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: John Thacker <johnthacker@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/main_window.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 9ca52461da..4cb3ef5cf9 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -88,11 +88,6 @@ DIAG_ON(frame-larger-than=) #include <QTreeWidget> #include <QUrl> -#if defined(QT_MACEXTRAS_LIB) && QT_VERSION < QT_VERSION_CHECK(5, 2, 1) -#include <QtMacExtras/QMacNativeToolBar> -#endif - - //menu_recent_file_write_all // If we ever add support for multiple windows this will need to be replaced. @@ -436,10 +431,6 @@ MainWindow::MainWindow(QWidget *parent) : #endif #if defined(Q_OS_MAC) -#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 main_ui_->goToPacketLabel->setAttribute(Qt::WA_MacSmallSize, true); main_ui_->goToLineEdit->setAttribute(Qt::WA_MacSmallSize, true); |