diff options
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qdial.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qdial.h | 7 | ||||
-rw-r--r-- | src/widgets/widgets/widgets.pri | 7 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index a219e4ccb6..c08c820127 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -39,8 +39,6 @@ #include "qdial.h" -#ifndef QT_NO_DIAL - #include <qapplication.h> #include <qbitmap.h> #include <qcolor.h> @@ -480,5 +478,3 @@ bool QDial::event(QEvent *e) QT_END_NAMESPACE #include "moc_qdial.cpp" - -#endif // QT_NO_DIAL diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index 472b14fcdb..ed753d86b0 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -43,12 +43,11 @@ #include <QtWidgets/qtwidgetsglobal.h> -#if QT_CONFIG(dial) - #include <QtWidgets/qabstractslider.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(dial); +QT_BEGIN_NAMESPACE class QDialPrivate; class QStyleOptionSlider; @@ -101,6 +100,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(dial) - #endif // QDIAL_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index aed3f53478..0d6361ad77 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -5,7 +5,6 @@ HEADERS += \ widgets/qbuttongroup_p.h \ widgets/qabstractspinbox.h \ widgets/qabstractspinbox_p.h \ - widgets/qdial.h \ widgets/qframe.h \ widgets/qframe_p.h \ widgets/qgroupbox.h \ @@ -58,7 +57,6 @@ HEADERS += \ SOURCES += \ widgets/qbuttongroup.cpp \ widgets/qabstractspinbox.cpp \ - widgets/qdial.cpp \ widgets/qeffects.cpp \ widgets/qframe.cpp \ widgets/qgroupbox.cpp \ @@ -152,6 +150,11 @@ qtConfig(datetimeedit) { widgets/qdatetimeedit.cpp } +qtConfig(dial) { + HEADERS += widgets/qdial.h + SOURCES += widgets/qdial.cpp +} + qtConfig(dockwidget) { HEADERS += \ widgets/qdockwidget.h \ |