diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /src/widgets/widgets/qmainwindowlayout.cpp | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'src/widgets/widgets/qmainwindowlayout.cpp')
| -rw-r--r-- | src/widgets/widgets/qmainwindowlayout.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 2c1c2ab75c..da5f00efe0 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -59,7 +59,9 @@ #endif #include <qapplication.h> +#if QT_CONFIG(statusbar) #include <qstatusbar.h> +#endif #include <qstring.h> #include <qstyle.h> #include <qstylepainter.h> @@ -2310,7 +2312,7 @@ void QMainWindowLayout::setDockOptions(QMainWindow::DockOptions opts) invalidate(); } -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *QMainWindowLayout::statusBar() const { return statusbar ? qobject_cast<QStatusBar *>(statusbar->widget()) : 0; } @@ -2322,7 +2324,7 @@ void QMainWindowLayout::setStatusBar(QStatusBar *sb) statusbar = sb ? new QWidgetItemV2(sb) : 0; invalidate(); } -#endif // QT_NO_STATUSBAR +#endif // QT_CONFIG(statusbar) QWidget *QMainWindowLayout::centralWidget() const { |