summaryrefslogtreecommitdiffstats
path: root/src/widgets/accessible
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r--src/widgets/accessible/complexwidgets.cpp4
-rw-r--r--src/widgets/accessible/qaccessiblemenu.cpp11
-rw-r--r--src/widgets/accessible/qaccessiblewidgetfactory.cpp2
-rw-r--r--src/widgets/accessible/qaccessiblewidgets.cpp2
-rw-r--r--src/widgets/accessible/rangecontrols.cpp4
-rw-r--r--src/widgets/accessible/rangecontrols_p.h2
-rw-r--r--src/widgets/accessible/simplewidgets.cpp8
7 files changed, 28 insertions, 5 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index 463019dbd0..ea3b88468b 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -130,12 +130,16 @@ public:
case QAccessible::Accelerator:
str = qt_accHotKey(m_parent->tabText(m_index));
break;
+#if QT_CONFIG(tooltip)
case QAccessible::Description:
str = m_parent->tabToolTip(m_index);
break;
+#endif
+#if QT_CONFIG(whatsthis)
case QAccessible::Help:
str = m_parent->tabWhatsThis(m_index);
break;
+#endif
default:
break;
}
diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp
index 4a684e01f9..ae50bbaef0 100644
--- a/src/widgets/accessible/qaccessiblemenu.cpp
+++ b/src/widgets/accessible/qaccessiblemenu.cpp
@@ -117,7 +117,11 @@ QAccessibleInterface *QAccessibleMenu::parent() const
parentCandidates << menu()->parentWidget();
parentCandidates << menuAction->associatedWidgets();
foreach (QWidget *w, parentCandidates) {
- if (qobject_cast<QMenu*>(w) || qobject_cast<QMenuBar*>(w)) {
+ if (qobject_cast<QMenu*>(w)
+#if QT_CONFIG(menubar)
+ || qobject_cast<QMenuBar*>(w)
+#endif
+ ) {
if (w->actions().indexOf(menuAction) != -1)
return getOrCreateMenu(w, menuAction);
}
@@ -348,13 +352,16 @@ void QAccessibleMenuItem::doAction(const QString &actionName)
if (actionName == pressAction()) {
m_action->trigger();
} else if (actionName == showMenuAction()) {
+#if QT_CONFIG(menubar)
if (QMenuBar *bar = qobject_cast<QMenuBar*>(owner())) {
if (m_action->menu() && m_action->menu()->isVisible()) {
m_action->menu()->hide();
} else {
bar->setActiveAction(m_action);
}
- } else if (QMenu *menu = qobject_cast<QMenu*>(owner())){
+ } else
+#endif
+ if (QMenu *menu = qobject_cast<QMenu*>(owner())){
if (m_action->menu() && m_action->menu()->isVisible()) {
m_action->menu()->hide();
} else {
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index dfc8c84836..da184fd90d 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -94,9 +94,9 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
} else if (classname == QLatin1String("QScrollBar")) {
iface = new QAccessibleScrollBar(widget);
#endif
+#ifndef QT_NO_SLIDER
} else if (classname == QLatin1String("QAbstractSlider")) {
iface = new QAccessibleAbstractSlider(widget);
-#ifndef QT_NO_SLIDER
} else if (classname == QLatin1String("QSlider")) {
iface = new QAccessibleSlider(widget);
#endif
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index b814762168..4c48ecb465 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -85,7 +85,9 @@ QList<QWidget*> childWidgets(const QWidget *widget)
QString objectName = w->objectName();
if (!w->isWindow()
&& !qobject_cast<QFocusFrame*>(w)
+#if QT_CONFIG(menu)
&& !qobject_cast<QMenu*>(w)
+#endif
&& objectName != QLatin1String("qt_rubberband")
&& objectName != QLatin1String("qt_qmainwindow_extended_splitter")) {
widgets.append(w);
diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp
index 2f781fe619..602d0c7e11 100644
--- a/src/widgets/accessible/rangecontrols.cpp
+++ b/src/widgets/accessible/rangecontrols.cpp
@@ -81,10 +81,14 @@ QAbstractSpinBox *QAccessibleAbstractSpinBox::abstractSpinBox() const
QAccessibleInterface *QAccessibleAbstractSpinBox::lineEditIface() const
{
+#if QT_CONFIG(lineedit)
// QAccessibleLineEdit is only used to forward the text functions
if (!lineEdit)
lineEdit = new QAccessibleLineEdit(abstractSpinBox()->lineEdit());
return lineEdit;
+#else
+ return nullptr;
+#endif
}
QString QAccessibleAbstractSpinBox::text(QAccessible::Text t) const
diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h
index 28f613462d..c0b010c292 100644
--- a/src/widgets/accessible/rangecontrols_p.h
+++ b/src/widgets/accessible/rangecontrols_p.h
@@ -143,6 +143,7 @@ protected:
};
#endif // QT_NO_SPINBOX
+#if QT_CONFIG(slider)
class QAccessibleAbstractSlider: public QAccessibleWidget, public QAccessibleValueInterface
{
public:
@@ -159,6 +160,7 @@ public:
protected:
QAbstractSlider *abstractSlider() const;
};
+#endif // QT_CONFIG(slider)
#ifndef QT_NO_SCROLLBAR
class QAccessibleScrollBar : public QAccessibleAbstractSlider
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp
index bd9f0c6e01..a2805a2458 100644
--- a/src/widgets/accessible/simplewidgets.cpp
+++ b/src/widgets/accessible/simplewidgets.cpp
@@ -339,10 +339,12 @@ QStringList QAccessibleToolButton::actionNames() const
{
QStringList names;
if (widget()->isEnabled()) {
+#if QT_CONFIG(menu)
if (toolButton()->menu())
names << showMenuAction();
if (toolButton()->popupMode() != QToolButton::InstantPopup)
names << QAccessibleButton::actionNames();
+#endif
}
return names;
}
@@ -355,12 +357,12 @@ void QAccessibleToolButton::doAction(const QString &actionName)
if (actionName == pressAction()) {
button()->click();
} else if (actionName == showMenuAction()) {
+#if QT_CONFIG(menu)
if (toolButton()->popupMode() != QToolButton::InstantPopup) {
toolButton()->setDown(true);
-#ifndef QT_NO_MENU
toolButton()->showMenu();
-#endif
}
+#endif
} else {
QAccessibleButton::doAction(actionName);
}
@@ -542,9 +544,11 @@ QString QAccessibleGroupBox::text(QAccessible::Text t) const
case QAccessible::Name:
txt = qt_accStripAmp(groupBox()->title());
break;
+#if QT_CONFIG(tooltip)
case QAccessible::Description:
txt = groupBox()->toolTip();
break;
+#endif
case QAccessible::Accelerator:
txt = qt_accHotKey(groupBox()->title());
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 13:49:44 +0000