From 3ade30a2af5b64cb2437d214f25e4dcbfa00c49d Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Sat, 22 Jul 2017 15:15:12 +0200
Subject: Convert features.calendarwidget to QT_[REQUIRE_]CONFIG

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

(limited to 'src/widgets/accessible')

diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index a39674dc7a..20104eea68 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -209,7 +209,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
     } else if (classname == QLatin1String("QScrollArea")) {
         iface = new QAccessibleScrollArea(widget);
 #endif
-#ifndef QT_NO_CALENDARWIDGET
+#if QT_CONFIG(calendarwidget)
     } else if (classname == QLatin1String("QCalendarWidget")) {
         iface = new QAccessibleCalendarWidget(widget);
 #endif
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index 60f489d487..eec60ac0c8 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -62,7 +62,9 @@
 #include <QRubberBand>
 #endif
 #include <QTextBrowser>
+#if QT_CONFIG(calendarwidget)
 #include <QCalendarWidget>
+#endif
 #include <QAbstractItemView>
 #include <QDockWidget>
 #include <QMainWindow>
@@ -506,7 +508,7 @@ QAccessible::Role QAccessibleTextBrowser::role() const
 }
 #endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR
 
-#ifndef QT_NO_CALENDARWIDGET
+#if QT_CONFIG(calendarwidget)
 // ===================== QAccessibleCalendarWidget ========================
 QAccessibleCalendarWidget::QAccessibleCalendarWidget(QWidget *widget)
     : QAccessibleWidget(widget, QAccessible::Table)
@@ -561,7 +563,7 @@ QWidget *QAccessibleCalendarWidget::navigationBar() const
     }
     return 0;
 }
-#endif // QT_NO_CALENDARWIDGET
+#endif // QT_CONFIG(calendarwidget)
 
 #ifndef QT_NO_DOCKWIDGET
 
diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h
index 4d945a2016..781e297a3b 100644
--- a/src/widgets/accessible/qaccessiblewidgets_p.h
+++ b/src/widgets/accessible/qaccessiblewidgets_p.h
@@ -266,7 +266,7 @@ public:
 };
 #endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR
 
-#ifndef QT_NO_CALENDARWIDGET
+#if QT_CONFIG(calendarwidget)
 class QAccessibleCalendarWidget : public QAccessibleWidget
 {
 public:
@@ -284,7 +284,7 @@ private:
     QAbstractItemView *calendarView() const;
     QWidget *navigationBar() const;
 };
-#endif // QT_NO_CALENDARWIDGET
+#endif // QT_CONFIG(calendarwidget)
 
 #ifndef QT_NO_DOCKWIDGET
 class QAccessibleDockWidget: public QAccessibleWidget
-- 
cgit v1.2.3