diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-27 22:04:01 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-08-08 07:37:59 +0000 |
commit | c36a5aee70d0d4dec9062739cde9f83139900d92 (patch) | |
tree | 65ca6ea74b1d1d8537b1cac903c6bb7eb96fe451 /src/widgets/accessible | |
parent | b75bc0f75c09b192dba68449b009cdf175519dbd (diff) |
Convert features.dial to QT_[REQUIRE_]CONFIG
Change-Id: I9fea2451fe3567fdd1af1540e9a55f218f54b569
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r-- | src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 | ||||
-rw-r--r-- | src/widgets/accessible/rangecontrols.cpp | 7 | ||||
-rw-r--r-- | src/widgets/accessible/rangecontrols_p.h | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index c3de7a7dd6..be52188cc3 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -193,7 +193,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QDialogButtonBox")) { iface = new QAccessibleDialogButtonBox(widget); #endif -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) } else if (classname == QLatin1String("QDial")) { iface = new QAccessibleDial(widget); #endif diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp index 602d0c7e11..1aa1fb4929 100644 --- a/src/widgets/accessible/rangecontrols.cpp +++ b/src/widgets/accessible/rangecontrols.cpp @@ -40,7 +40,9 @@ #include "rangecontrols_p.h" #include <qslider.h> +#if QT_CONFIG(dial) #include <qdial.h> +#endif #include <qspinbox.h> #include <qscrollbar.h> #include <qstyle.h> @@ -48,7 +50,6 @@ #include <qdebug.h> #include <qglobal.h> #include <QDoubleSpinBox> -#include <QDial> #include <QtWidgets/qlineedit.h> #include <qmath.h> #include <private/qmath_p.h> @@ -398,7 +399,7 @@ QAbstractSlider *QAccessibleAbstractSlider::abstractSlider() const #endif // QT_NO_SLIDER -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) // ======================================= QAccessibleDial ====================================== QAccessibleDial::QAccessibleDial(QWidget *widget) : QAccessibleAbstractSlider(widget, QAccessible::Dial) @@ -419,7 +420,7 @@ QDial *QAccessibleDial::dial() const { return static_cast<QDial*>(object()); } -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) #endif // QT_NO_ACCESSIBILITY diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index c0b010c292..8c1f96fdf8 100644 --- a/src/widgets/accessible/rangecontrols_p.h +++ b/src/widgets/accessible/rangecontrols_p.h @@ -186,7 +186,7 @@ protected: }; #endif // QT_NO_SLIDER -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) class QAccessibleDial : public QAccessibleAbstractSlider { public: @@ -197,7 +197,7 @@ public: protected: QDial *dial() const; }; -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) #endif // QT_NO_ACCESSIBILITY |