From 29f82ad3dbfb33462e9d01a628d26fa678fcf710 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Deniz=20T=C3=BCrkoglu?= Date: Wed, 27 Aug 2014 21:08:57 +0200 Subject: [PATCH] Fix MainToolBar visibility not saving in OSX The current code, although completely valid, doesn't work due to moc not seeing built in defines. See; https://bugreports.qt-project.org/browse/QTBUG-34593 --- src/qtui/mainwin.cpp | 6 ++++-- src/qtui/mainwin.h | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 8e0172d1..68d3c6cd 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -1022,13 +1022,15 @@ void MainWin::setupToolBars() #endif } -#ifdef Q_WS_MAC void MainWin::saveMainToolBarStatus(bool enabled) { +#ifdef Q_OS_MAC QtUiSettings uiSettings; uiSettings.setValue("ShowMainToolBar", enabled); -} +#else + Q_UNUSED(enabled); #endif +} void MainWin::connectedToCore() diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index e1ff7ea6..f0750ed2 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -152,9 +152,7 @@ private slots: void saveMenuBarStatus(bool enabled); void saveStatusBarStatus(bool enabled); -#ifdef Q_WS_MAC void saveMainToolBarStatus(bool enabled); -#endif void loadLayout(); void saveLayout(); -- 2.20.1