3 files changed, 8 insertions, 6 deletions
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index 8c1e591f0e..796485c81a 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -215,7 +215,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
     } else if (classname == QLatin1String("QCalendarWidget")) {
         iface = new QAccessibleCalendarWidget(widget);
 #endif
-#ifndef QT_NO_DOCKWIDGET
+#if QT_CONFIG(dockwidget)
     } else if (classname == QLatin1String("QDockWidget")) {
         iface = new QAccessibleDockWidget(widget);
 #endif
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index 676ac67b56..e28833274e 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -68,9 +68,11 @@
 #if QT_CONFIG(itemviews)
 #include <QAbstractItemView>
 #endif
+#if QT_CONFIG(dockwidget)
 #include <QDockWidget>
-#include <QMainWindow>
 #include <private/qdockwidget_p.h>
+#endif
+#include <QMainWindow>
 #include <QFocusFrame>
 
 #ifndef QT_NO_ACCESSIBILITY
@@ -567,7 +569,7 @@ QWidget *QAccessibleCalendarWidget::navigationBar() const
 }
 #endif // QT_CONFIG(calendarwidget)
 
-#ifndef QT_NO_DOCKWIDGET
+#if QT_CONFIG(dockwidget)
 
 // Dock Widget - order of children:
 // - Content widget
@@ -648,7 +650,7 @@ QString QAccessibleDockWidget::text(QAccessible::Text t) const
     }
     return QString();
 }
-#endif // QT_NO_DOCKWIDGET
+#endif // QT_CONFIG(dockwidget)
 
 #ifndef QT_NO_CURSOR
 
diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h
index 781e297a3b..3ff67c0c9b 100644
--- a/src/widgets/accessible/qaccessiblewidgets_p.h
+++ b/src/widgets/accessible/qaccessiblewidgets_p.h
@@ -286,7 +286,7 @@ private:
 };
 #endif // QT_CONFIG(calendarwidget)
 
-#ifndef QT_NO_DOCKWIDGET
+#if QT_CONFIG(dockwidget)
 class QAccessibleDockWidget: public QAccessibleWidget
 {
 public:
@@ -302,7 +302,7 @@ protected:
     QDockWidgetLayout *dockWidgetLayout() const;
 };
 
-#endif // QT_NO_DOCKWIDGET
+#endif // QT_CONFIG(dockwidget)
 
 #ifndef QT_NO_MAINWINDOW
 class QAccessibleMainWindow : public QAccessibleWidget