From 314a591461c58addd2805e0b4dc2cdb4308d5d31 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 27 Aug 2017 19:06:42 +0200
Subject: Convert features.menubar to QT_[REQUIRE_]CONFIG

Change-Id: Idbd4978852fa280dd18a5684469d499da3892126
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qmdisubwindow_p.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/widgets/widgets/qmdisubwindow_p.h')

diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h
index 71fcc38378..51652a78ff 100644
--- a/src/widgets/widgets/qmdisubwindow_p.h
+++ b/src/widgets/widgets/qmdisubwindow_p.h
@@ -58,7 +58,9 @@
 
 #include <QStyle>
 #include <QStyleOptionTitleBar>
+#if QT_CONFIG(menubar)
 #include <QMenuBar>
+#endif
 #include <QSizeGrip>
 #include <QPointer>
 #include <QDebug>
@@ -96,7 +98,7 @@ public:
     ControlContainer(QMdiSubWindow *mdiChild);
     ~ControlContainer();
 
-#ifndef QT_NO_MENUBAR
+#if QT_CONFIG(menubar)
     void showButtonsInMenuBar(QMenuBar *menuBar);
     void removeButtonsFromMenuBar(QMenuBar *menuBar = 0);
     QMenuBar *menuBar() const { return m_menuBar; }
@@ -108,7 +110,7 @@ public:
 private:
     QPointer<QWidget> previousLeft;
     QPointer<QWidget> previousRight;
-#ifndef QT_NO_MENUBAR
+#if QT_CONFIG(menubar)
     QPointer<QMenuBar> m_menuBar;
 #endif
     QPointer<QWidget> m_controllerWidget;
@@ -252,7 +254,7 @@ public:
     int titleBarHeight(const QStyleOptionTitleBar &options) const;
     void sizeParameters(int *margin, int *minWidth) const;
     bool drawTitleBarWhenMaximized() const;
-#ifndef QT_NO_MENUBAR
+#if QT_CONFIG(menubar)
     QMenuBar *menuBar() const;
     void showButtonsInMenuBar(QMenuBar *menuBar);
     void removeButtonsFromMenuBar();
-- 
cgit v1.2.3


From 10601aa7d2aea597ae5127ef83cea3c7549d5712 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 27 Aug 2017 19:09:45 +0200
Subject: Convert features.mdiarea to QT_[REQUIRE_]CONFIG

Change-Id: I6d2ec035a218869aa6595f5848de94ce491d3124
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qmdisubwindow_p.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/widgets/widgets/qmdisubwindow_p.h')

diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h
index 51652a78ff..37e276d7c3 100644
--- a/src/widgets/widgets/qmdisubwindow_p.h
+++ b/src/widgets/widgets/qmdisubwindow_p.h
@@ -54,8 +54,6 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "qmdisubwindow.h"
 
-#ifndef QT_NO_MDIAREA
-
 #include <QStyle>
 #include <QStyleOptionTitleBar>
 #if QT_CONFIG(menubar)
@@ -66,6 +64,8 @@
 #include <QDebug>
 #include <private/qwidget_p.h>
 
+QT_REQUIRE_CONFIG(mdiarea);
+
 QT_BEGIN_NAMESPACE
 
 class QVBoxLayout;
@@ -343,8 +343,6 @@ public:
     }
 };
 
-#endif // QT_NO_MDIAREA
-
 QT_END_NAMESPACE
 
 #endif // QMDISUBWINDOW_P_H
-- 
cgit v1.2.3


From bef8b905afec924936d7efcf150760ae86cc9e20 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sat, 2 Sep 2017 20:49:54 +0200
Subject: Convert features.sizegrip to QT_[REQUIRE_]CONFIG

Change-Id: Ieac4ae1f0b8b84e943c00da9903346a44e57138c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qmdisubwindow_p.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/widgets/widgets/qmdisubwindow_p.h')

diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h
index 37e276d7c3..23bdf10fd9 100644
--- a/src/widgets/widgets/qmdisubwindow_p.h
+++ b/src/widgets/widgets/qmdisubwindow_p.h
@@ -59,7 +59,9 @@
 #if QT_CONFIG(menubar)
 #include <QMenuBar>
 #endif
+#if QT_CONFIG(sizegrip)
 #include <QSizeGrip>
+#endif
 #include <QPointer>
 #include <QDebug>
 #include <private/qwidget_p.h>
@@ -178,7 +180,7 @@ public:
     QPointer<QWidget> baseWidget;
     QPointer<QWidget> restoreFocusWidget;
     QPointer<QMdi::ControlContainer> controlContainer;
-#ifndef QT_NO_SIZEGRIP
+#if QT_CONFIG(sizegrip)
     QPointer<QSizeGrip> sizeGrip;
 #endif
 #if QT_CONFIG(rubberband)
@@ -278,7 +280,7 @@ public:
 #endif
 #endif // QT_NO_ACTION
     QSize iconSize() const;
-#ifndef QT_NO_SIZEGRIP
+#if QT_CONFIG(sizegrip)
     void setSizeGrip(QSizeGrip *sizeGrip);
     void setSizeGripVisible(bool visible = true) const;
 #endif
-- 
cgit v1.2.3


From 6d699d08200b1fe3a616dfbc275d46c98b77fcbd Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 3 Sep 2017 18:45:41 +0200
Subject: Convert features.menu to QT_[REQUIRE_]CONFIG

Change-Id: I031356411294b259ebd2b22c53159c93fd92af6e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/widgets/qmdisubwindow_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/widgets/widgets/qmdisubwindow_p.h')

diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h
index 23bdf10fd9..d03aca168b 100644
--- a/src/widgets/widgets/qmdisubwindow_p.h
+++ b/src/widgets/widgets/qmdisubwindow_p.h
@@ -236,7 +236,7 @@ public:
     void leaveInteractiveMode();
     void removeBaseWidget();
     void initOperationMap();
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     void createSystemMenu();
 #endif
     void updateCursor();
@@ -275,7 +275,7 @@ public:
     void setVisible(WindowStateAction, bool visible = true);
 #ifndef QT_NO_ACTION
     void setEnabled(WindowStateAction, bool enable = true);
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     void addToSystemMenu(WindowStateAction, const QString &text, const char *slot);
 #endif
 #endif // QT_NO_ACTION
-- 
cgit v1.2.3