diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-13 16:02:39 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-06-18 12:22:11 +0200 |
commit | 907f73bbc5b6c98b01d7c6088a294dea66634a3f (patch) | |
tree | dc13b60296bed0a15e1ed829681fa105db8c8d86 /src/qt/macdockiconhandler.mm | |
parent | bad068ad9f4bc60bfc10e27d4ffaec92d7df8491 (diff) | |
download | bitcoin-907f73bbc5b6c98b01d7c6088a294dea66634a3f.tar.xz |
gui: Remove QT_VERSION fallbacks for Qt < 5
There were surprisingly many `#ifdef` fallbacks for Qt 4.
Remiving them simplifies maintenance, as well as adding new GUI
functionality.
Diffstat (limited to 'src/qt/macdockiconhandler.mm')
-rw-r--r-- | src/qt/macdockiconhandler.mm | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/qt/macdockiconhandler.mm b/src/qt/macdockiconhandler.mm index 9e7de0f98f..a0b62ae000 100644 --- a/src/qt/macdockiconhandler.mm +++ b/src/qt/macdockiconhandler.mm @@ -14,10 +14,6 @@ #include <objc/objc.h> #include <objc/message.h> -#if QT_VERSION < 0x050000 -extern void qt_mac_set_dock_menu(QMenu *); -#endif - static MacDockIconHandler *s_instance = nullptr; bool dockClickHandler(id self,SEL _cmd,...) { @@ -54,9 +50,7 @@ MacDockIconHandler::MacDockIconHandler() : QObject() this->m_dummyWidget = new QWidget(); this->m_dockMenu = new QMenu(this->m_dummyWidget); this->setMainWindow(nullptr); -#if QT_VERSION < 0x050000 - qt_mac_set_dock_menu(this->m_dockMenu); -#elif QT_VERSION >= 0x050200 +#if QT_VERSION >= 0x050200 this->m_dockMenu->setAsDockMenu(); #endif [pool release]; |