diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2011-05-12 12:10:56 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2011-05-12 12:15:20 (GMT) |
| commit | 15a5eaf0eeb44833a052b6201171fca4b9e8f74e (patch) | |
| tree | 4d05c520fa1e6b09f2103054313270f60ad47a3e | |
| parent | 37c329a3e35fabc88fbcad824a69f37c671d2132 (diff) | |
| download | Qt-15a5eaf0eeb44833a052b6201171fca4b9e8f74e.zip Qt-15a5eaf0eeb44833a052b6201171fca4b9e8f74e.tar.gz Qt-15a5eaf0eeb44833a052b6201171fca4b9e8f74e.tar.bz2 | |
Clear confusion between QMainWindow and QMainWindowLayout.
The variables activateUnifiedToolbarAfterFullScreen
and useHIToolBar were implemented in both classes.
This was an obvious bug, where variable would be
initialized in one class and use in the other one.
Task-number: QTBUG-18874
Reviewed-by: Yoann Lopes
| -rw-r--r-- | src/gui/widgets/qmainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout.cpp | 1 | ||||
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout_p.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 43d6796..e39e595 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -78,7 +78,6 @@ public: : layout(0), explicitIconSize(false), toolButtonStyle(Qt::ToolButtonIconOnly) #ifdef Q_WS_MAC , useHIToolBar(false) - , activateUnifiedToolbarAfterFullScreen(false) #endif #if !defined(QT_NO_DOCKWIDGET) && !defined(QT_NO_CURSOR) , hasOldCursor(false) , cursorAdjusted(false) @@ -90,7 +89,6 @@ public: Qt::ToolButtonStyle toolButtonStyle; #ifdef Q_WS_MAC bool useHIToolBar; - bool activateUnifiedToolbarAfterFullScreen; #endif void init(); QList<int> hoverSeparator; diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp index d4afe07..8880ca9 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -1699,6 +1699,7 @@ QMainWindowLayout::QMainWindowLayout(QMainWindow *mainwindow, QLayout *parentLay , gapIndicator(new QRubberBand(QRubberBand::Rectangle, mainwindow)) #endif //QT_NO_RUBBERBAND #ifdef Q_WS_MAC + , activateUnifiedToolbarAfterFullScreen(false) , blockVisiblityCheck(false) #endif { diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h index 20aca61..0442510 100644 --- a/src/gui/widgets/qmainwindowlayout_p.h +++ b/src/gui/widgets/qmainwindowlayout_p.h @@ -338,7 +338,6 @@ public: void removeFromMacToolbar(QToolBar *toolbar); void cleanUpMacToolbarItems(); void fixSizeInUnifiedToolbar(QToolBar *tb) const; - bool useHIToolBar; bool activateUnifiedToolbarAfterFullScreen; void syncUnifiedToolbarVisibility(); bool blockVisiblityCheck; |