summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r--src/widgets/widgets/qslider.cpp3
-rw-r--r--src/widgets/widgets/qslider.h7
-rw-r--r--src/widgets/widgets/widgets.pri7
3 files changed, 7 insertions, 10 deletions
diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp
index 356cbcfce7..47d3b2fb81 100644
--- a/src/widgets/widgets/qslider.cpp
+++ b/src/widgets/widgets/qslider.cpp
@@ -38,7 +38,6 @@
****************************************************************************/
#include "qslider.h"
-#ifndef QT_NO_SLIDER
#ifndef QT_NO_ACCESSIBILITY
#include "qaccessible.h"
#endif
@@ -547,8 +546,6 @@ Q_WIDGETS_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider)
return sliderOption;
}
-#endif
-
QT_END_NAMESPACE
#include "moc_qslider.cpp"
diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h
index 001863c18d..642e836af7 100644
--- a/src/widgets/widgets/qslider.h
+++ b/src/widgets/widgets/qslider.h
@@ -42,12 +42,11 @@
#include <QtWidgets/qtwidgetsglobal.h>
-#if QT_CONFIG(slider)
-
#include <QtWidgets/qabstractslider.h>
-QT_BEGIN_NAMESPACE
+QT_REQUIRE_CONFIG(slider);
+QT_BEGIN_NAMESPACE
class QSliderPrivate;
class QStyleOptionSlider;
@@ -102,6 +101,4 @@ private:
QT_END_NAMESPACE
-#endif // QT_CONFIG(slider)
-
#endif // QSLIDER_H
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 41e4bd16b9..361e336474 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -5,7 +5,6 @@ HEADERS += \
widgets/qframe_p.h \
widgets/qmenu.h \
widgets/qmenu_p.h \
- widgets/qslider.h \
widgets/qtextedit.h \
widgets/qtextedit_p.h \
widgets/qtoolbar.h \
@@ -23,7 +22,6 @@ HEADERS += \
SOURCES += \
widgets/qframe.cpp \
widgets/qmenu.cpp \
- widgets/qslider.cpp \
widgets/qtextedit.cpp \
widgets/qtoolbar.cpp \
widgets/qtoolbarlayout.cpp \
@@ -257,6 +255,11 @@ qtConfig(sizegrip) {
SOURCES += widgets/qsizegrip.cpp
}
+qtConfig(slider) {
+ HEADERS += widgets/qslider.h
+ SOURCES += widgets/qslider.cpp
+}
+
qtConfig(spinbox) {
HEADERS += \
widgets/qabstractspinbox.h \