summaryrefslogtreecommitdiffstats
path: root/src/widgets/accessible
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r--src/widgets/accessible/qaccessiblewidgetfactory.cpp2
-rw-r--r--src/widgets/accessible/rangecontrols.cpp7
-rw-r--r--src/widgets/accessible/rangecontrols_p.h4
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