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/qmainwindow.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/qmainwindow.cpp')
| -rw-r--r-- | src/widgets/widgets/qmainwindow.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 694a36ed5b..e1841bbc55 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -51,7 +51,9 @@ #include <qapplication.h> #include <qmenubar.h> +#if QT_CONFIG(statusbar) #include <qstatusbar.h> +#endif #include <qevent.h> #include <qstyle.h> #include <qdebug.h> @@ -578,7 +580,7 @@ void QMainWindow::setMenuWidget(QWidget *menuBar) } #endif // QT_NO_MENUBAR -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) /*! Returns the status bar for the main window. This function creates and returns an empty status bar if the status bar does not exist. @@ -615,7 +617,7 @@ void QMainWindow::setStatusBar(QStatusBar *statusbar) } d->layout->setStatusBar(statusbar); } -#endif // QT_NO_STATUSBAR +#endif // QT_CONFIG(statusbar) /*! Returns the central widget for the main window. This function @@ -1315,7 +1317,7 @@ bool QMainWindow::event(QEvent *event) #if QT_CONFIG(statustip) case QEvent::StatusTip: -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) if (QStatusBar *sb = d->layout->statusBar()) sb->showMessage(static_cast<QStatusTipEvent*>(event)->tip()); else |