3 files changed, 8 insertions, 6 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index 9475b5a96c..5442c145a0 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -45,7 +45,10 @@
 #if QT_CONFIG(itemviews)
 #include <qheaderview.h>
 #endif
+#if QT_CONFIG(tabbar)
 #include <qtabbar.h>
+#include <private/qtabbar_p.h>
+#endif
 #if QT_CONFIG(combobox)
 #include <qcombobox.h>
 #endif
@@ -56,7 +59,6 @@
 #if QT_CONFIG(whatsthis)
 #include <qwhatsthis.h>
 #endif
-#include <private/qtabbar_p.h>
 #include <QAbstractScrollArea>
 #include <QScrollArea>
 #include <QScrollBar>
@@ -69,7 +71,7 @@ QT_BEGIN_NAMESPACE
 QString qt_accStripAmp(const QString &text);
 QString qt_accHotKey(const QString &text);
 
-#ifndef QT_NO_TABBAR
+#if QT_CONFIG(tabbar)
 /*!
   \class QAccessibleTabBar
   \brief The QAccessibleTabBar class implements the QAccessibleInterface for tab bars.
@@ -262,7 +264,7 @@ QString QAccessibleTabBar::text(QAccessible::Text t) const
     return QString();
 }
 
-#endif // QT_NO_TABBAR
+#endif // QT_CONFIG(tabbar)
 
 #if QT_CONFIG(combobox)
 /*!
diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h
index 849169ab8a..6f5c950631 100644
--- a/src/widgets/accessible/complexwidgets_p.h
+++ b/src/widgets/accessible/complexwidgets_p.h
@@ -107,7 +107,7 @@ public:
 };
 #endif // QT_NO_SCROLLAREA
 
-#ifndef QT_NO_TABBAR
+#if QT_CONFIG(tabbar)
 class QAccessibleTabBar : public QAccessibleWidget
 {
 public:
@@ -124,7 +124,7 @@ protected:
     QTabBar *tabBar() const;
     mutable QHash<int, QAccessible::Id> m_childInterfaces;
 };
-#endif // QT_NO_TABBAR
+#endif // QT_CONFIG(tabbar)
 
 #if QT_CONFIG(combobox)
 class QAccessibleComboBox : public QAccessibleWidget
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index 796485c81a..c3de7a7dd6 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -153,7 +153,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
         iface = new QAccessibleTable(widget);
     // ### This should be cleaned up. We return the parent for the scrollarea to hide it.
 #endif // QT_CONFIG(itemviews)
-#ifndef QT_NO_TABBAR
+#if QT_CONFIG(tabbar)
     } else if (classname == QLatin1String("QTabBar")) {
         iface = new QAccessibleTabBar(widget);
 #endif