1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn setUnifiedTitleAndToolBarOnMac into a slot.

Browse Source 
Change-Id: Ieb28960bf3fb9e70a6bcc6d47ff723f0ed4e1b63
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
This commit is contained in:
Jake Petroules 2014-05-08 00:47:45 -04:00 committed by The Qt Project
parent 309d3557ca
commit a97f96ca8e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/widgets/widgets/qmainwindow.h
View File

@ -155,7 +155,6 @@ public:
void removeToolBar(QToolBar *toolbar); void removeToolBar(QToolBar *toolbar);
void removeToolBarBreak(QToolBar *before); void removeToolBarBreak(QToolBar *before);
void setUnifiedTitleAndToolBarOnMac(bool set);
bool unifiedTitleAndToolBarOnMac() const; bool unifiedTitleAndToolBarOnMac() const;
Qt::ToolBarArea toolBarArea(QToolBar *toolbar) const; Qt::ToolBarArea toolBarArea(QToolBar *toolbar) const;
@ -182,12 +181,14 @@ public:
virtual QMenu *createPopupMenu(); virtual QMenu *createPopupMenu();
#endif #endif
#ifndef QT_NO_DOCKWIDGET
public Q_SLOTS: public Q_SLOTS:
#ifndef QT_NO_DOCKWIDGET
void setAnimated(bool enabled); void setAnimated(bool enabled);
void setDockNestingEnabled(bool enabled); void setDockNestingEnabled(bool enabled);
#endif #endif
#ifndef QT_NO_TOOLBAR
void setUnifiedTitleAndToolBarOnMac(bool set);
#endif
Q_SIGNALS: Q_SIGNALS:
void iconSizeChanged(const QSize &iconSize); void iconSizeChanged(const QSize &iconSize);