diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-21 09:39:49 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-21 10:54:41 +0000 |
| commit | 3ebcf54e63f29d57e189895bdf52f6b5199e827f (patch) | |
| tree | 6d7b930b7722700cab989e665271f1adc04b3aea | |
| parent | 2b40d7b8bb85db0d4f15fe77c451af4473f29c32 (diff) | |
Controls: move Accessible from QML to C++ for Dial
Change-Id: I95604be3b31bc69f7ac3f7ed8ff444833713b67d
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| -rw-r--r-- | src/imports/controls/Dial.qml | 3 | ||||
| -rw-r--r-- | src/imports/controls/qquickdial.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/accessibility/data/dial.qml | 12 | ||||
| -rw-r--r-- | tests/auto/accessibility/tst_accessibility.cpp | 5 |
4 files changed, 19 insertions, 3 deletions
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index fcca2066..1d546a5e 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -43,9 +43,6 @@ AbstractDial { implicitWidth: 100 implicitHeight: 100 - Accessible.pressed: pressed - Accessible.role: Accessible.Dial - //! [background] background: Rectangle { color: control.Theme.backgroundColor diff --git a/src/imports/controls/qquickdial.cpp b/src/imports/controls/qquickdial.cpp index 407899d3..c607fba3 100644 --- a/src/imports/controls/qquickdial.cpp +++ b/src/imports/controls/qquickdial.cpp @@ -163,6 +163,7 @@ QQuickDial::QQuickDial(QQuickItem *parent) : QQuickControl(*(new QQuickDialPrivate), parent) { setActiveFocusOnTab(true); + setAccessibleRole(0x00000031); //QAccessible::Dial setAcceptedMouseButtons(Qt::LeftButton); } @@ -367,6 +368,7 @@ void QQuickDial::setPressed(bool pressed) Q_D(QQuickDial); if (d->pressed != pressed) { d->pressed = pressed; + setAccessibleProperty("pressed", pressed); emit pressedChanged(); } } diff --git a/tests/auto/accessibility/data/dial.qml b/tests/auto/accessibility/data/dial.qml new file mode 100644 index 00000000..6b2333b1 --- /dev/null +++ b/tests/auto/accessibility/data/dial.qml @@ -0,0 +1,12 @@ +import QtQuick 2.5 +import QtQuick.Window 2.2 +import QtQuick.Controls 2.0 + +Window { + visible: true + + Dial { + id: dial + objectName: "dial" + } +} diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp index 3a648dee..41a0ed4b 100644 --- a/tests/auto/accessibility/tst_accessibility.cpp +++ b/tests/auto/accessibility/tst_accessibility.cpp @@ -91,6 +91,11 @@ void tst_accessibility::a11y_data() QTest::newRow("ToolBar") << "toolbar" << 0x00000016 << ""; //QAccessible::ToolBar QTest::newRow("ToolButton") << "toolbutton" << 0x0000002B << "ToolButton"; //QAccessible::Button + QTest::newRow("Dial") << "dial" << 0x00000031 << ""; //QAccessible::Dial + // Drawer + // SwipeView + // Tumbler + QTest::newRow("CalendarView") << "calendarview" << 0x0 << "CalendarView"; //QAccessible::NoRole QTest::newRow("DayOfWeekRow") << "dayofweekrow" << 0x0 << "DayOfWeekRow"; //QAccessible::NoRole QTest::newRow("WeekNumberColumn") << "weeknumbercolumn" << 0x0 << "WeekNumberColumn"; //QAccessible::NoRole |