diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-05-08 00:47:45 -0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-21 21:07:52 +0200 |
| commit | a97f96ca8e55efcf5e608fd1a77d1535422cb3f1 (patch) | |
| tree | da6bd3dec3e546f132e884e7fef6b1813b1484e7 | |
| parent | 309d3557ca832c42b8fbd372b957af51510b159e (diff) | |
Turn setUnifiedTitleAndToolBarOnMac into a slot.
Change-Id: Ieb28960bf3fb9e70a6bcc6d47ff723f0ed4e1b63
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| -rw-r--r-- | src/widgets/widgets/qmainwindow.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 8411bf9f6b..6c392ca4cc 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); |