diff options
Diffstat (limited to 'src/widgets/widgets/qmainwindow.h')
| -rw-r--r-- | src/widgets/widgets/qmainwindow.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 530ea7086d..069683d4ac 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -46,10 +46,9 @@ #include <QtWidgets/qtabwidget.h> #endif -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(mainwindow); -#ifndef QT_NO_MAINWINDOW +QT_BEGIN_NAMESPACE class QDockWidget; class QMainWindowPrivate; @@ -123,7 +122,7 @@ public: bool isSeparator(const QPoint &pos) const; -#ifndef QT_NO_MENUBAR +#if QT_CONFIG(menubar) QMenuBar *menuBar() const; void setMenuBar(QMenuBar *menubar); @@ -182,7 +181,7 @@ public: QByteArray saveState(int version = 0) const; bool restoreState(const QByteArray &state, int version = 0); -#ifndef QT_NO_MENU +#if QT_CONFIG(menu) virtual QMenu *createPopupMenu(); #endif @@ -215,8 +214,6 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QMainWindow::DockOptions) -#endif // QT_NO_MAINWINDOW - QT_END_NAMESPACE #endif // QDYNAMICMAINWINDOW_H |