Convert features.combobox to QT_[REQUIRE_]CONFIG

Change-Id: I2f415de8556289a6461a645d559be17089c43c99
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

6 files changed, 14 insertions, 14 deletions

diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp
index 6a8167b5e5..506986f4ba 100644
--- a/src/widgets/widgets/qcombobox.cpp
+++ b/src/widgets/widgets/qcombobox.cpp
@@ -39,7 +39,6 @@
 
 #include "qcombobox.h"
 
-#ifndef QT_NO_COMBOBOX
 #include <qstylepainter.h>
 #include <qpa/qplatformtheme.h>
 #include <qpa/qplatformmenu.h>
@@ -3486,5 +3485,3 @@ QT_END_NAMESPACE
 
 #include "moc_qcombobox.cpp"
 #include "moc_qcombobox_p.cpp"
-
-#endif // QT_NO_COMBOBOX
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 8f99594a76..a6aac6f8aa 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -46,9 +46,9 @@
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qvariant.h>
 
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(combobox);
 
-#ifndef QT_NO_COMBOBOX
+QT_BEGIN_NAMESPACE
 
 class QAbstractItemView;
 class QLineEdit;
@@ -277,8 +277,6 @@ inline void QComboBox::insertItem(int aindex, const QString &atext,
                                   const QVariant &auserData)
 { insertItem(aindex, QIcon(), atext, auserData); }
 
-#endif // QT_NO_COMBOBOX
-
 QT_END_NAMESPACE
 
 #endif // QCOMBOBOX_H
diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h
index 6c36359f81..ab4dd0281f 100644
--- a/src/widgets/widgets/qcombobox_p.h
+++ b/src/widgets/widgets/qcombobox_p.h
@@ -54,7 +54,6 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "QtWidgets/qcombobox.h"
 
-#ifndef QT_NO_COMBOBOX
 #include "QtWidgets/qabstractslider.h"
 #include "QtWidgets/qapplication.h"
 #include "QtWidgets/qitemdelegate.h"
@@ -74,6 +73,8 @@
 
 #include <limits.h>
 
+QT_REQUIRE_CONFIG(combobox);
+
 QT_BEGIN_NAMESPACE
 
 class QAction;
@@ -423,6 +424,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_COMBOBOX
-
 #endif // QCOMBOBOX_P_H
diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h
index bc70780de9..5ac5a9db6a 100644
--- a/src/widgets/widgets/qdatetimeedit_p.h
+++ b/src/widgets/widgets/qdatetimeedit_p.h
@@ -52,7 +52,6 @@
 //
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
-#include "QtWidgets/qcombobox.h"
 #include "QtWidgets/qcalendarwidget.h"
 #include "QtWidgets/qspinbox.h"
 #include "QtWidgets/qtoolbutton.h"
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index bdb17f10d3..893506f16f 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -42,7 +42,9 @@
 #ifndef QT_NO_TOOLBAR
 
 #include <qapplication.h>
+#if QT_CONFIG(combobox)
 #include <qcombobox.h>
+#endif
 #include <qevent.h>
 #include <qlayout.h>
 #include <qmainwindow.h>
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index ee510bd120..7a39f3fb3e 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -5,8 +5,6 @@ HEADERS += \
         widgets/qbuttongroup_p.h \
         widgets/qabstractspinbox.h \
         widgets/qabstractspinbox_p.h \
-        widgets/qcombobox.h \
-        widgets/qcombobox_p.h \
         widgets/qdial.h \
         widgets/qdockwidget.h \
         widgets/qdockwidget_p.h \
@@ -66,7 +64,6 @@ HEADERS += \
 SOURCES += \
         widgets/qbuttongroup.cpp \
         widgets/qabstractspinbox.cpp \
-        widgets/qcombobox.cpp \
         widgets/qdial.cpp \
         widgets/qdockwidget.cpp \
         widgets/qdockarealayout.cpp \
@@ -140,6 +137,14 @@ qtConfig(checkbox) {
         widgets/qcheckbox.cpp
 }
 
+qtConfig(combobox) {
+    HEADERS += \
+        widgets/qcombobox.h \
+        widgets/qcombobox_p.h
+
+    SOURCES += widgets/qcombobox.cpp
+}
+
 qtConfig(commandlinkbutton) {
     HEADERS += \
         widgets/qcommandlinkbutton.h