diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-15 15:41:14 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-15 14:45:16 +0000 |
commit | d833c9224984ad408ca4074cbe147a39dabc8277 (patch) | |
tree | de3d8c7e27c5b4a48307a5e396a405653b5fd43d /tests/auto/accessibility | |
parent | 7e28ff0854b1b1e95e58a57555e51961967fdda2 (diff) |
Calendar: fix compilation with QT_NO_ACCESSIBILITY
Change-Id: If840f4bf715b4290fb50388b94e33420505b1a9b
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests/auto/accessibility')
-rw-r--r-- | tests/auto/accessibility/data/calendarview-2.qml | 13 | ||||
-rw-r--r-- | tests/auto/accessibility/data/calendarview.qml | 14 | ||||
-rw-r--r-- | tests/auto/accessibility/data/dayofweekrow-2.qml | 12 | ||||
-rw-r--r-- | tests/auto/accessibility/data/dayofweekrow.qml | 13 | ||||
-rw-r--r-- | tests/auto/accessibility/data/weeknumbercolumn-2.qml | 12 | ||||
-rw-r--r-- | tests/auto/accessibility/data/weeknumbercolumn.qml | 13 | ||||
-rw-r--r-- | tests/auto/accessibility/tst_accessibility.cpp | 10 |
7 files changed, 86 insertions, 1 deletions
diff --git a/tests/auto/accessibility/data/calendarview-2.qml b/tests/auto/accessibility/data/calendarview-2.qml new file mode 100644 index 00000000..ab4a2177 --- /dev/null +++ b/tests/auto/accessibility/data/calendarview-2.qml @@ -0,0 +1,13 @@ +import QtQuick 2.5 +import QtQuick.Window 2.2 +import QtQuick.Calendar 2.0 + +Window { + visible: true + + CalendarView { + id: calendarview + objectName: "calendarview" + title: "CalendarView" + } +} diff --git a/tests/auto/accessibility/data/calendarview.qml b/tests/auto/accessibility/data/calendarview.qml new file mode 100644 index 00000000..3b377ef6 --- /dev/null +++ b/tests/auto/accessibility/data/calendarview.qml @@ -0,0 +1,14 @@ +import QtQuick 2.5 +import QtQuick.Window 2.2 +import QtQuick.Calendar 2.0 + +Window { + visible: true + + CalendarView { + id: calendarview + objectName: "calendarview" + title: "CalendarView" + Accessible.name: title + } +} diff --git a/tests/auto/accessibility/data/dayofweekrow-2.qml b/tests/auto/accessibility/data/dayofweekrow-2.qml new file mode 100644 index 00000000..a562916a --- /dev/null +++ b/tests/auto/accessibility/data/dayofweekrow-2.qml @@ -0,0 +1,12 @@ +import QtQuick 2.5 +import QtQuick.Window 2.2 +import QtQuick.Calendar 2.0 + +Window { + visible: true + + DayOfWeekRow { + id: dayofweekrow + objectName: "dayofweekrow" + } +} diff --git a/tests/auto/accessibility/data/dayofweekrow.qml b/tests/auto/accessibility/data/dayofweekrow.qml new file mode 100644 index 00000000..dc6243ea --- /dev/null +++ b/tests/auto/accessibility/data/dayofweekrow.qml @@ -0,0 +1,13 @@ +import QtQuick 2.5 +import QtQuick.Window 2.2 +import QtQuick.Calendar 2.0 + +Window { + visible: true + + DayOfWeekRow { + id: dayofweekrow + objectName: "dayofweekrow" + Accessible.name: "DayOfWeekRow" + } +} diff --git a/tests/auto/accessibility/data/weeknumbercolumn-2.qml b/tests/auto/accessibility/data/weeknumbercolumn-2.qml new file mode 100644 index 00000000..c6af782d --- /dev/null +++ b/tests/auto/accessibility/data/weeknumbercolumn-2.qml @@ -0,0 +1,12 @@ +import QtQuick 2.5 +import QtQuick.Window 2.2 +import QtQuick.Calendar 2.0 + +Window { + visible: true + + WeekNumberColumn { + id: weeknumbercolumn + objectName: "weeknumbercolumn" + } +} diff --git a/tests/auto/accessibility/data/weeknumbercolumn.qml b/tests/auto/accessibility/data/weeknumbercolumn.qml new file mode 100644 index 00000000..8728d6ea --- /dev/null +++ b/tests/auto/accessibility/data/weeknumbercolumn.qml @@ -0,0 +1,13 @@ +import QtQuick 2.5 +import QtQuick.Window 2.2 +import QtQuick.Calendar 2.0 + +Window { + visible: true + + WeekNumberColumn { + id: weeknumbercolumn + objectName: "weeknumbercolumn" + Accessible.name: "WeekNumberColumn" + } +} diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp index 31700044..3a648dee 100644 --- a/tests/auto/accessibility/tst_accessibility.cpp +++ b/tests/auto/accessibility/tst_accessibility.cpp @@ -90,6 +90,10 @@ void tst_accessibility::a11y_data() QTest::newRow("ToggleButton") << "togglebutton" << 0x0000002B << "ToggleButton"; //QAccessible::Button QTest::newRow("ToolBar") << "toolbar" << 0x00000016 << ""; //QAccessible::ToolBar QTest::newRow("ToolButton") << "toolbutton" << 0x0000002B << "ToolButton"; //QAccessible::Button + + QTest::newRow("CalendarView") << "calendarview" << 0x0 << "CalendarView"; //QAccessible::NoRole + QTest::newRow("DayOfWeekRow") << "dayofweekrow" << 0x0 << "DayOfWeekRow"; //QAccessible::NoRole + QTest::newRow("WeekNumberColumn") << "weeknumbercolumn" << 0x0 << "WeekNumberColumn"; //QAccessible::NoRole } void tst_accessibility::a11y() @@ -101,7 +105,11 @@ void tst_accessibility::a11y() QQmlComponent component(&engine); QString fn = name; #ifdef QT_NO_ACCESSIBILITY - if (name == QLatin1Literal("textarea") || name == QLatin1Literal("textfield")) + if (name == QLatin1Literal("textarea") + || name == QLatin1Literal("textfield") + || name == QLatin1Literal("calendarview") + || name == QLatin1Literal("dayofweekrow") + || name == QLatin1Literal("weeknumbercolumn")) fn += QLatin1Literal("-2"); #endif component.loadUrl(testFileUrl(fn + ".qml")); |