From a97f96ca8e55efcf5e608fd1a77d1535422cb3f1 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@petroules.com>
Date: Thu, 8 May 2014 00:47:45 -0400
Subject: [PATCH] Turn setUnifiedTitleAndToolBarOnMac into a slot.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ieb28960bf3fb9e70a6bcc6d47ff723f0ed4e1b63
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
---
 src/widgets/widgets/qmainwindow.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h
index 8411bf9f6b1..6c392ca4cce 100644
--- a/src/widgets/widgets/qmainwindow.h
+++ b/src/widgets/widgets/qmainwindow.h
@@ -155,7 +155,6 @@ public:
     void removeToolBar(QToolBar *toolbar);
     void removeToolBarBreak(QToolBar *before);
 
-    void setUnifiedTitleAndToolBarOnMac(bool set);
     bool unifiedTitleAndToolBarOnMac() const;
 
     Qt::ToolBarArea toolBarArea(QToolBar *toolbar) const;
@@ -182,12 +181,14 @@ public:
     virtual QMenu *createPopupMenu();
 #endif
 
-
-#ifndef QT_NO_DOCKWIDGET
 public Q_SLOTS:
+#ifndef QT_NO_DOCKWIDGET
     void setAnimated(bool enabled);
     void setDockNestingEnabled(bool enabled);
 #endif
+#ifndef QT_NO_TOOLBAR
+    void setUnifiedTitleAndToolBarOnMac(bool set);
+#endif
 
 Q_SIGNALS:
     void iconSizeChanged(const QSize &iconSize);