From d24dd043d52af12e0ad68625ca0c9a9ec16fc8e1 Mon Sep 17 00:00:00 2001 From: Michael Kedzierski Date: Fri, 17 Jan 2014 23:52:15 +1100 Subject: [PATCH 1/1] Change ifdefs around Main ToolBar fix to target mac only. --- src/qtui/mainwin.cpp | 4 ++-- src/qtui/mainwin.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 39199d39..1399113c 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -1016,7 +1016,7 @@ void MainWin::setupToolBars() QtUi::toolBarActionProvider()->addActions(_mainToolBar, ToolBarActionProvider::MainToolBar); _toolbarMenu->addAction(_mainToolBar->toggleViewAction()); -#ifndef HAVE_KDE +#ifdef Q_WS_MAC QtUiSettings uiSettings; bool visible = uiSettings.value("ShowMainToolBar", QVariant(true)).toBool(); @@ -1025,7 +1025,7 @@ void MainWin::setupToolBars() #endif } -#ifndef HAVE_KDE +#ifdef Q_WS_MAC void MainWin::saveMainToolBarStatus(bool enabled) { QtUiSettings uiSettings; diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 7e2cc0eb..49e4cef4 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -154,7 +154,7 @@ private slots: void saveMenuBarStatus(bool enabled); void saveStatusBarStatus(bool enabled); -#ifndef HAVE_KDE +#ifdef Q_WS_MAC void saveMainToolBarStatus(bool enabled); #endif -- 2.20.1