summaryrefslogtreecommitdiffstats
path: root/src/widgets/accessible
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r--src/widgets/accessible/accessible.pri7
-rw-r--r--src/widgets/accessible/complexwidgets.cpp2
-rw-r--r--src/widgets/accessible/complexwidgets_p.h2
-rw-r--r--src/widgets/accessible/itemviews.cpp3
-rw-r--r--src/widgets/accessible/itemviews_p.h5
-rw-r--r--src/widgets/accessible/qaccessiblewidgetfactory.cpp6
-rw-r--r--src/widgets/accessible/qaccessiblewidgets.cpp2
7 files changed, 16 insertions, 11 deletions
diff --git a/src/widgets/accessible/accessible.pri b/src/widgets/accessible/accessible.pri
index e63ae28d30..06467d0ff0 100644
--- a/src/widgets/accessible/accessible.pri
+++ b/src/widgets/accessible/accessible.pri
@@ -5,7 +5,6 @@ qtConfig(accessibility) {
accessible/qaccessiblewidget.h \
accessible/qaccessiblewidgetfactory_p.h \
accessible/complexwidgets_p.h \
- accessible/itemviews_p.h \
accessible/qaccessiblemenu_p.h \
accessible/qaccessiblewidgets_p.h \
accessible/rangecontrols_p.h \
@@ -15,9 +14,13 @@ qtConfig(accessibility) {
accessible/qaccessiblewidget.cpp \
accessible/qaccessiblewidgetfactory.cpp \
accessible/complexwidgets.cpp \
- accessible/itemviews.cpp \
accessible/qaccessiblemenu.cpp \
accessible/qaccessiblewidgets.cpp \
accessible/rangecontrols.cpp \
accessible/simplewidgets.cpp
+
+ qtConfig(itemviews) {
+ HEADERS += accessible/itemviews_p.h
+ SOURCES += accessible/itemviews.cpp
+ }
}
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index 29e11556aa..9475b5a96c 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -42,7 +42,9 @@
#include <qaccessible.h>
#include <qapplication.h>
#include <qevent.h>
+#if QT_CONFIG(itemviews)
#include <qheaderview.h>
+#endif
#include <qtabbar.h>
#if QT_CONFIG(combobox)
#include <qcombobox.h>
diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h
index b4b4e89a1a..849169ab8a 100644
--- a/src/widgets/accessible/complexwidgets_p.h
+++ b/src/widgets/accessible/complexwidgets_p.h
@@ -54,7 +54,9 @@
#include <QtWidgets/private/qtwidgetsglobal_p.h>
#include <QtCore/qpointer.h>
#include <QtWidgets/qaccessiblewidget.h>
+#if QT_CONFIG(itemviews)
#include <QtWidgets/qabstractitemview.h>
+#endif
QT_BEGIN_NAMESPACE
diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index 1ccfcbe4e5..4d37400dc9 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -56,7 +56,6 @@
QT_BEGIN_NAMESPACE
-#ifndef QT_NO_ITEMVIEWS
/*
Implementation of the IAccessible2 table2 interface. Much simpler than
the other table interfaces since there is only the main table and cells:
@@ -1215,8 +1214,6 @@ QHeaderView *QAccessibleTableHeaderCell::headerView() const
return header;
}
-#endif // QT_NO_ITEMVIEWS
-
QT_END_NAMESPACE
#endif // QT_NO_ACCESSIBILITY
diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h
index 9542a569db..72841b8a0f 100644
--- a/src/widgets/accessible/itemviews_p.h
+++ b/src/widgets/accessible/itemviews_p.h
@@ -58,13 +58,12 @@
#include <QtWidgets/qabstractitemview.h>
#include <QtWidgets/qheaderview.h>
+QT_REQUIRE_CONFIG(itemviews);
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
-#ifndef QT_NO_ITEMVIEWS
-
class QAccessibleTableCell;
class QAccessibleTableHeaderCell;
@@ -299,8 +298,6 @@ private:
};
-#endif
-
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index 371158c73c..8c1e591f0e 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -43,7 +43,9 @@
#include "simplewidgets_p.h"
#include "rangecontrols_p.h"
#include "complexwidgets_p.h"
+#if QT_CONFIG(itemviews)
#include "itemviews_p.h"
+#endif
#include <qtoolbutton.h>
#if QT_CONFIG(treeview)
@@ -146,11 +148,11 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
} else if (classname == QLatin1String("QTreeView")) {
iface = new QAccessibleTree(widget);
#endif // QT_CONFIG(treeview)
-#ifndef QT_NO_ITEMVIEWS
+#if QT_CONFIG(itemviews)
} else if (classname == QLatin1String("QTableView") || classname == QLatin1String("QListView")) {
iface = new QAccessibleTable(widget);
// ### This should be cleaned up. We return the parent for the scrollarea to hide it.
-#endif // QT_NO_ITEMVIEWS
+#endif // QT_CONFIG(itemviews)
#ifndef QT_NO_TABBAR
} else if (classname == QLatin1String("QTabBar")) {
iface = new QAccessibleTabBar(widget);
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index eec60ac0c8..676ac67b56 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -65,7 +65,9 @@
#if QT_CONFIG(calendarwidget)
#include <QCalendarWidget>
#endif
+#if QT_CONFIG(itemviews)
#include <QAbstractItemView>
+#endif
#include <QDockWidget>
#include <QMainWindow>
#include <private/qdockwidget_p.h>