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.cpp17
-rw-r--r--src/widgets/accessible/complexwidgets_p.h10
-rw-r--r--src/widgets/accessible/itemviews.cpp7
-rw-r--r--src/widgets/accessible/itemviews_p.h5
-rw-r--r--src/widgets/accessible/qaccessiblewidgetfactory.cpp14
-rw-r--r--src/widgets/accessible/qaccessiblewidgets.cpp16
-rw-r--r--src/widgets/accessible/qaccessiblewidgets_p.h8
8 files changed, 49 insertions, 35 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 50aba759c3..5442c145a0 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -42,10 +42,16 @@
#include <qaccessible.h>
#include <qapplication.h>
#include <qevent.h>
+#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>
-#include <qlistview.h>
+#endif
#include <qlineedit.h>
#include <qstyle.h>
#include <qstyleoption.h>
@@ -53,7 +59,6 @@
#if QT_CONFIG(whatsthis)
#include <qwhatsthis.h>
#endif
-#include <private/qtabbar_p.h>
#include <QAbstractScrollArea>
#include <QScrollArea>
#include <QScrollBar>
@@ -66,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.
@@ -259,9 +264,9 @@ QString QAccessibleTabBar::text(QAccessible::Text t) const
return QString();
}
-#endif // QT_NO_TABBAR
+#endif // QT_CONFIG(tabbar)
-#ifndef QT_NO_COMBOBOX
+#if QT_CONFIG(combobox)
/*!
\class QAccessibleComboBox
\brief The QAccessibleComboBox class implements the QAccessibleInterface for editable and read-only combo boxes.
@@ -379,7 +384,7 @@ QStringList QAccessibleComboBox::keyBindingsForAction(const QString &/*actionNam
return QStringList();
}
-#endif // QT_NO_COMBOBOX
+#endif // QT_CONFIG(combobox)
#ifndef QT_NO_SCROLLAREA
// ======================= QAccessibleAbstractScrollArea =======================
diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h
index d43b06f4a4..6f5c950631 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
@@ -105,7 +107,7 @@ public:
};
#endif // QT_NO_SCROLLAREA
-#ifndef QT_NO_TABBAR
+#if QT_CONFIG(tabbar)
class QAccessibleTabBar : public QAccessibleWidget
{
public:
@@ -122,9 +124,9 @@ protected:
QTabBar *tabBar() const;
mutable QHash<int, QAccessible::Id> m_childInterfaces;
};
-#endif // QT_NO_TABBAR
+#endif // QT_CONFIG(tabbar)
-#ifndef QT_NO_COMBOBOX
+#if QT_CONFIG(combobox)
class QAccessibleComboBox : public QAccessibleWidget
{
public:
@@ -146,7 +148,7 @@ public:
protected:
QComboBox *comboBox() const;
};
-#endif // QT_NO_COMBOBOX
+#endif // QT_CONFIG(combobox)
#endif // QT_NO_ACCESSIBILITY
diff --git a/src/widgets/accessible/itemviews.cpp b/src/widgets/accessible/itemviews.cpp
index 4d1a4589ee..4d37400dc9 100644
--- a/src/widgets/accessible/itemviews.cpp
+++ b/src/widgets/accessible/itemviews.cpp
@@ -43,7 +43,9 @@
#if QT_CONFIG(tableview)
#include <qtableview.h>
#endif
+#if QT_CONFIG(listview)
#include <qlistview.h>
+#endif
#if QT_CONFIG(treeview)
#include <qtreeview.h>
#include <private/qtreeview_p.h>
@@ -54,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:
@@ -96,7 +97,7 @@ QAccessibleTable::QAccessibleTable(QWidget *w)
m_role = QAccessible::Tree;
} else
#endif
-#ifndef QT_NO_LISTVIEW
+#if QT_CONFIG(listview)
if (qobject_cast<const QListView*>(view())) {
m_role = QAccessible::List;
} else
@@ -1213,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 a39674dc7a..c3de7a7dd6 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)
@@ -79,7 +81,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
else
iface = new QAccessibleLineEdit(widget);
#endif
-#ifndef QT_NO_COMBOBOX
+#if QT_CONFIG(combobox)
} else if (classname == QLatin1String("QComboBox")) {
iface = new QAccessibleComboBox(widget);
#endif
@@ -146,12 +148,12 @@ 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
-#ifndef QT_NO_TABBAR
+#endif // QT_CONFIG(itemviews)
+#if QT_CONFIG(tabbar)
} else if (classname == QLatin1String("QTabBar")) {
iface = new QAccessibleTabBar(widget);
#endif
@@ -209,11 +211,11 @@ 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
-#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 60f489d487..e28833274e 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -62,11 +62,17 @@
#include <QRubberBand>
#endif
#include <QTextBrowser>
+#if QT_CONFIG(calendarwidget)
#include <QCalendarWidget>
+#endif
+#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
@@ -506,7 +512,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,9 +567,9 @@ QWidget *QAccessibleCalendarWidget::navigationBar() const
}
return 0;
}
-#endif // QT_NO_CALENDARWIDGET
+#endif // QT_CONFIG(calendarwidget)
-#ifndef QT_NO_DOCKWIDGET
+#if QT_CONFIG(dockwidget)
// Dock Widget - order of children:
// - Content widget
@@ -644,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 4d945a2016..3ff67c0c9b 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,9 +284,9 @@ private:
QAbstractItemView *calendarView() const;
QWidget *navigationBar() const;
};
-#endif // QT_NO_CALENDARWIDGET
+#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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 18:20:38 +0000