diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:37:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:58:32 +0200 |
| commit | 01bc69f99f189b03d0b9cad77cc300798937cad1 (patch) | |
| tree | 730f3b691cfc1830ec617b3c2ad8df16180de724 /src/widgets/widgets/qmdiarea_p.h | |
| parent | c23c4a921d0e9e2d18a62af82d38ca27eac7bcb3 (diff) | |
| parent | 6d699d08200b1fe3a616dfbc275d46c98b77fcbd (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/styles/mac/qmacstyle_mac.mm
src/widgets/util/qcompleter.cpp
src/widgets/widgets/qmainwindowlayout.cpp
src/widgets/widgets/qmdisubwindow.cpp
Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973
Diffstat (limited to 'src/widgets/widgets/qmdiarea_p.h')
| -rw-r--r-- | src/widgets/widgets/qmdiarea_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h index 10b5de6840..4740993af7 100644 --- a/src/widgets/widgets/qmdiarea_p.h +++ b/src/widgets/widgets/qmdiarea_p.h @@ -55,7 +55,7 @@ #include "qmdiarea.h" #include "qmdisubwindow.h" -#ifndef QT_NO_MDIAREA +QT_REQUIRE_CONFIG(mdiarea); #include <QList> #include <QVector> @@ -266,8 +266,6 @@ public: #endif // QT_CONFIG(rubberband) }; -#endif // QT_NO_MDIAREA - QT_END_NAMESPACE #endif // QMDIAREA_P_H |