diff options
-rw-r--r-- | src/quicktemplates2/qquickdialog.cpp | 7 | ||||
-rw-r--r-- | src/quicktemplates2/qquickdialog_p.h | 4 | ||||
-rw-r--r-- | tests/auto/accessibility/data/dialog.qml | 12 | ||||
-rw-r--r-- | tests/auto/accessibility/tst_accessibility.cpp | 1 |
4 files changed, 24 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickdialog.cpp b/src/quicktemplates2/qquickdialog.cpp index 6bbe73ce..8b05f546 100644 --- a/src/quicktemplates2/qquickdialog.cpp +++ b/src/quicktemplates2/qquickdialog.cpp @@ -343,4 +343,11 @@ void QQuickDialog::spacingChange(qreal newSpacing, qreal oldSpacing) d->layout->update(); } +#ifndef QT_NO_ACCESSIBILITY +QAccessible::Role QQuickDialog::accessibleRole() const +{ + return QAccessible::Dialog; +} +#endif + QT_END_NAMESPACE diff --git a/src/quicktemplates2/qquickdialog_p.h b/src/quicktemplates2/qquickdialog_p.h index ea03dddf..64d6a6d2 100644 --- a/src/quicktemplates2/qquickdialog_p.h +++ b/src/quicktemplates2/qquickdialog_p.h @@ -97,6 +97,10 @@ protected: void paddingChange(const QMarginsF &newPadding, const QMarginsF &oldPadding) override; void spacingChange(qreal newSpacing, qreal oldSpacing) override; +#ifndef QT_NO_ACCESSIBILITY + QAccessible::Role accessibleRole() const override; +#endif + private: Q_DISABLE_COPY(QQuickDialog) Q_DECLARE_PRIVATE(QQuickDialog) diff --git a/tests/auto/accessibility/data/dialog.qml b/tests/auto/accessibility/data/dialog.qml new file mode 100644 index 00000000..df0257e8 --- /dev/null +++ b/tests/auto/accessibility/data/dialog.qml @@ -0,0 +1,12 @@ +import QtQuick 2.5 +import QtQuick.Window 2.2 +import QtQuick.Controls 2.1 + +Window { + visible: true + + Dialog { + id: dialog + objectName: "dialog" + } +} diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp index e97e4702..fc3be1cb 100644 --- a/tests/auto/accessibility/tst_accessibility.cpp +++ b/tests/auto/accessibility/tst_accessibility.cpp @@ -73,6 +73,7 @@ void tst_accessibility::a11y_data() QTest::newRow("BusyIndicator") << "busyindicator" << 0x00000027 << ""; //QAccessible::Indicator QTest::newRow("Button") << "button" << 0x0000002B << "Button"; //QAccessible::Button QTest::newRow("CheckBox") << "checkbox" << 0x0000002C << "CheckBox"; //QAccessible::CheckBox + QTest::newRow("Dialog") << "dialog" << 0x00000012 << ""; //QAccessible::Dialog // Frame // GroupBox QTest::newRow("Label") << "label" << 0x00000029 << "Label"; //QAccessible::StaticText |