Convert features.scrollbar to QT_[REQUIRE_]CONFIG

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

5 files changed, 11 insertions, 5 deletions

diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index 5442c145a0..efbca0331d 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -61,7 +61,9 @@
 #endif
 #include <QAbstractScrollArea>
 #include <QScrollArea>
+#if QT_CONFIG(scrollbar)
 #include <QScrollBar>
+#endif
 #include <QDebug>
 
 #ifndef QT_NO_ACCESSIBILITY
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index cbc0ce9596..4ca29dfbe6 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -93,7 +93,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
     } else if (classname == QLatin1String("QDoubleSpinBox")) {
         iface = new QAccessibleDoubleSpinBox(widget);
 #endif
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
     } else if (classname == QLatin1String("QScrollBar")) {
         iface = new QAccessibleScrollBar(widget);
 #endif
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index 72229834ec..4e7ba78620 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -47,7 +47,9 @@
 #include "qtextobject.h"
 #include "qplaintextedit.h"
 #include "qtextboundaryfinder.h"
+#if QT_CONFIG(scrollbar)
 #include "qscrollbar.h"
+#endif
 #include "qdebug.h"
 #include <QApplication>
 #include <QStackedWidget>
diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp
index 1aa1fb4929..c890c50938 100644
--- a/src/widgets/accessible/rangecontrols.cpp
+++ b/src/widgets/accessible/rangecontrols.cpp
@@ -44,7 +44,9 @@
 #include <qdial.h>
 #endif
 #include <qspinbox.h>
+#if QT_CONFIG(scrollbar)
 #include <qscrollbar.h>
+#endif
 #include <qstyle.h>
 #include <qstyleoption.h>
 #include <qdebug.h>
@@ -285,7 +287,7 @@ QString QAccessibleDoubleSpinBox::text(QAccessible::Text textType) const
 
 #endif // QT_NO_SPINBOX
 
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
 /*!
   \class QAccessibleScrollBar
   \brief The QAccessibleScrollBar class implements the QAccessibleInterface for scroll bars.
@@ -318,7 +320,7 @@ QString QAccessibleScrollBar::text(QAccessible::Text t) const
     return QAccessibleAbstractSlider::text(t);
 }
 
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
 
 #ifndef QT_NO_SLIDER
 /*!
diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h
index 8c1f96fdf8..49f57fa1c6 100644
--- a/src/widgets/accessible/rangecontrols_p.h
+++ b/src/widgets/accessible/rangecontrols_p.h
@@ -162,7 +162,7 @@ protected:
 };
 #endif // QT_CONFIG(slider)
 
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
 class QAccessibleScrollBar : public QAccessibleAbstractSlider
 {
 public:
@@ -172,7 +172,7 @@ public:
 protected:
     QScrollBar *scrollBar() const;
 };
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
 
 #ifndef QT_NO_SLIDER
 class QAccessibleSlider : public QAccessibleAbstractSlider