Convert features.spinbox to QT_[REQUIRE_]CONFIG

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

9 files changed, 21 insertions, 27 deletions

diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp
index 22f3745b26..c1fbdc3ddf 100644
--- a/src/widgets/widgets/qabstractspinbox.cpp
+++ b/src/widgets/widgets/qabstractspinbox.cpp
@@ -43,8 +43,6 @@
 #include <private/qlineedit_p.h>
 #include <qabstractspinbox.h>
 
-#ifndef QT_NO_SPINBOX
-
 #include <qapplication.h>
 #include <qstylehints.h>
 #include <qclipboard.h>
@@ -2145,5 +2143,3 @@ QVariant QAbstractSpinBoxPrivate::variantBound(const QVariant &min,
 QT_END_NAMESPACE
 
 #include "moc_qabstractspinbox.cpp"
-
-#endif // QT_NO_SPINBOX
diff --git a/src/widgets/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h
index d81cbfdc34..88735baf1c 100644
--- a/src/widgets/widgets/qabstractspinbox.h
+++ b/src/widgets/widgets/qabstractspinbox.h
@@ -44,10 +44,9 @@
 #include <QtWidgets/qwidget.h>
 #include <QtGui/qvalidator.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(spinbox);
 
-#ifndef QT_NO_SPINBOX
+QT_BEGIN_NAMESPACE
 
 class QLineEdit;
 
@@ -175,8 +174,6 @@ private:
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractSpinBox::StepEnabled)
 
-#endif // QT_NO_SPINBOX
-
 QT_END_NAMESPACE
 
 #endif // QABSTRACTSPINBOX_H
diff --git a/src/widgets/widgets/qabstractspinbox_p.h b/src/widgets/widgets/qabstractspinbox_p.h
index 5ec59d899b..8f312fa900 100644
--- a/src/widgets/widgets/qabstractspinbox_p.h
+++ b/src/widgets/widgets/qabstractspinbox_p.h
@@ -54,8 +54,6 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "QtWidgets/qabstractspinbox.h"
 
-#ifndef QT_NO_SPINBOX
-
 #include "QtWidgets/qlineedit.h"
 #include "QtWidgets/qstyleoption.h"
 #include "QtGui/qvalidator.h"
@@ -63,6 +61,8 @@
 #include "QtCore/qvariant.h"
 #include "private/qwidget_p.h"
 
+QT_REQUIRE_CONFIG(spinbox);
+
 QT_BEGIN_NAMESPACE
 
 QVariant operator+(const QVariant &arg1, const QVariant &arg2);
@@ -165,6 +165,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SPINBOX
-
 #endif // QABSTRACTSPINBOX_P_H
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index ff27a999d9..59f2a425a0 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -45,6 +45,7 @@
 #include <QtWidgets/qabstractitemdelegate.h>
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qvariant.h>
+#include <QtGui/qvalidator.h>
 
 QT_REQUIRE_CONFIG(combobox);
 
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index ae35a64663..45524831ee 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -58,6 +58,7 @@
 #endif
 #include <qpainter.h>
 #include <qpropertyanimation.h>
+#include <qvalidator.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp
index 508cb05cfc..b62a7768ce 100644
--- a/src/widgets/widgets/qspinbox.cpp
+++ b/src/widgets/widgets/qspinbox.cpp
@@ -40,8 +40,6 @@
 #include <private/qabstractspinbox_p.h>
 #include <qspinbox.h>
 
-#ifndef QT_NO_SPINBOX
-
 #include <qlineedit.h>
 #include <qlocale.h>
 #include <qvalidator.h>
@@ -1321,5 +1319,3 @@ bool QSpinBox::event(QEvent *event)
 QT_END_NAMESPACE
 
 #include "moc_qspinbox.cpp"
-
-#endif // QT_NO_SPINBOX
diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h
index 2eb12fd90d..b61e665413 100644
--- a/src/widgets/widgets/qspinbox.h
+++ b/src/widgets/widgets/qspinbox.h
@@ -43,10 +43,9 @@
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qabstractspinbox.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(spinbox);
 
-#ifndef QT_NO_SPINBOX
+QT_BEGIN_NAMESPACE
 
 class QSpinBoxPrivate;
 class Q_WIDGETS_EXPORT QSpinBox : public QAbstractSpinBox
@@ -168,8 +167,6 @@ private:
     Q_DECLARE_PRIVATE(QDoubleSpinBox)
 };
 
-#endif // QT_NO_SPINBOX
-
 QT_END_NAMESPACE
 
 #endif // QSPINBOX_H
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
index 3abe82ce59..1f73eb39bc 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
@@ -57,6 +57,8 @@
 #include "qgraphicssceneevent.h"
 #endif
 
+#include "qvalidator.h"
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 5c91882c68..c6f68d98d1 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -1,8 +1,6 @@
 # Qt widgets module
 
 HEADERS += \
-        widgets/qabstractspinbox.h \
-        widgets/qabstractspinbox_p.h \
         widgets/qframe.h \
         widgets/qframe_p.h \
         widgets/qlineedit.h \
@@ -10,7 +8,6 @@ HEADERS += \
         widgets/qmenu.h \
         widgets/qmenu_p.h \
         widgets/qslider.h \
-        widgets/qspinbox.h \
         widgets/qtextedit.h \
         widgets/qtextedit_p.h \
         widgets/qtoolbar.h \
@@ -27,13 +24,11 @@ HEADERS += \
         widgets/qplaintextedit_p.h
 
 SOURCES += \
-        widgets/qabstractspinbox.cpp \
         widgets/qframe.cpp \
         widgets/qlineedit_p.cpp \
         widgets/qlineedit.cpp \
         widgets/qmenu.cpp \
         widgets/qslider.cpp \
-        widgets/qspinbox.cpp \
         widgets/qtextedit.cpp \
         widgets/qtoolbar.cpp \
         widgets/qtoolbarlayout.cpp \
@@ -256,6 +251,17 @@ qtConfig(sizegrip) {
     SOURCES += widgets/qsizegrip.cpp
 }
 
+qtConfig(spinbox) {
+    HEADERS += \
+        widgets/qabstractspinbox.h \
+        widgets/qabstractspinbox_p.h \
+        widgets/qspinbox.h
+
+    SOURCES += \
+        widgets/qabstractspinbox.cpp \
+        widgets/qspinbox.cpp
+}
+
 qtConfig(splashscreen) {
     HEADERS += \
         widgets/qsplashscreen.h