From dab49434d87d28c67b486822f510457995c3a934 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sun, 27 Aug 2017 19:10:29 +0200
Subject: Convert features.scrollarea to QT_[REQUIRE_]CONFIG

Change-Id: Ifc7b0a6b025c282234b4aeaf23daecff8a558236
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/widgets/accessible/complexwidgets.cpp           | 6 ++++--
 src/widgets/accessible/complexwidgets_p.h           | 4 ++--
 src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/widgets/accessible')

diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index efbca0331d..7c19c5d20c 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -60,7 +60,9 @@
 #include <qwhatsthis.h>
 #endif
 #include <QAbstractScrollArea>
+#if QT_CONFIG(scrollarea)
 #include <QScrollArea>
+#endif
 #if QT_CONFIG(scrollbar)
 #include <QScrollBar>
 #endif
@@ -388,7 +390,7 @@ QStringList QAccessibleComboBox::keyBindingsForAction(const QString &/*actionNam
 
 #endif // QT_CONFIG(combobox)
 
-#ifndef QT_NO_SCROLLAREA
+#if QT_CONFIG(scrollarea)
 // ======================= QAccessibleAbstractScrollArea =======================
 QAccessibleAbstractScrollArea::QAccessibleAbstractScrollArea(QWidget *widget)
     : QAccessibleWidget(widget, QAccessible::Client)
@@ -497,7 +499,7 @@ QAccessibleScrollArea::QAccessibleScrollArea(QWidget *widget)
 {
     Q_ASSERT(qobject_cast<QScrollArea *>(widget));
 }
-#endif // QT_NO_SCROLLAREA
+#endif // QT_CONFIG(scrollarea)
 
 QT_END_NAMESPACE
 
diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h
index 6f5c950631..1887f98dca 100644
--- a/src/widgets/accessible/complexwidgets_p.h
+++ b/src/widgets/accessible/complexwidgets_p.h
@@ -70,7 +70,7 @@ class QTitleBar;
 class QAbstractScrollArea;
 class QScrollArea;
 
-#ifndef QT_NO_SCROLLAREA
+#if QT_CONFIG(scrollarea)
 class QAccessibleAbstractScrollArea : public QAccessibleWidget
 {
 public:
@@ -105,7 +105,7 @@ class QAccessibleScrollArea : public QAccessibleAbstractScrollArea
 public:
     explicit QAccessibleScrollArea(QWidget *widget);
 };
-#endif // QT_NO_SCROLLAREA
+#endif // QT_CONFIG(scrollarea)
 
 #if QT_CONFIG(tabbar)
 class QAccessibleTabBar : public QAccessibleWidget
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index 97eaea728c..0865281202 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -207,7 +207,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
     } else if (classname == QLatin1String("QTextBrowser")) {
         iface = new QAccessibleTextBrowser(widget);
 #endif
-#ifndef QT_NO_SCROLLAREA
+#if QT_CONFIG(scrollarea)
     } else if (classname == QLatin1String("QAbstractScrollArea")) {
         iface = new QAccessibleAbstractScrollArea(widget);
     } else if (classname == QLatin1String("QScrollArea")) {
-- 
cgit v1.2.3