diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-02 23:03:58 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-04 10:56:24 +0000 |
| commit | 1862fc5a32fd0523a56d24f2f90df3d9f54ba967 (patch) | |
| tree | 6b80f228ceef64cf5a42a3d9a016ed28172cc18c /tests/auto/accessibility | |
| parent | 0cb096251c4f5af79126e71cfa7a7f9e910dac95 (diff) | |
Rename CalendarView to MonthGrid
Let's reserve CalendarView for a bit higher level control that combines
MonthGrid, DayOfWeekRow and WeekNumberColumn, and provides built-in
navigation. CalendarView would use the not-so-extensible CalendarModel
internally, so we could get that out of the public API as well...
Change-Id: I43126ed4c87f54a5b24129b9d60c969f5bd58642
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests/auto/accessibility')
| -rw-r--r-- | tests/auto/accessibility/data/monthgrid-2.qml (renamed from tests/auto/accessibility/data/calendarview-2.qml) | 8 | ||||
| -rw-r--r-- | tests/auto/accessibility/data/monthgrid.qml (renamed from tests/auto/accessibility/data/calendarview.qml) | 8 | ||||
| -rw-r--r-- | tests/auto/accessibility/tst_accessibility.cpp | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/accessibility/data/calendarview-2.qml b/tests/auto/accessibility/data/monthgrid-2.qml index 526662b7..76af6646 100644 --- a/tests/auto/accessibility/data/calendarview-2.qml +++ b/tests/auto/accessibility/data/monthgrid-2.qml @@ -5,9 +5,9 @@ import Qt.labs.calendar 1.0 Window { visible: true - CalendarView { - id: calendarview - objectName: "calendarview" - title: "CalendarView" + MonthGrid { + id: monthgrid + objectName: "monthgrid" + title: "MonthGrid" } } diff --git a/tests/auto/accessibility/data/calendarview.qml b/tests/auto/accessibility/data/monthgrid.qml index f2452901..7c8d6451 100644 --- a/tests/auto/accessibility/data/calendarview.qml +++ b/tests/auto/accessibility/data/monthgrid.qml @@ -5,10 +5,10 @@ import Qt.labs.calendar 1.0 Window { visible: true - CalendarView { - id: calendarview - objectName: "calendarview" - title: "CalendarView" + MonthGrid { + id: monthgrid + objectName: "monthgrid" + title: "MonthGrid" Accessible.name: title } } diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp index 450fb88a..857cefd2 100644 --- a/tests/auto/accessibility/tst_accessibility.cpp +++ b/tests/auto/accessibility/tst_accessibility.cpp @@ -95,8 +95,8 @@ void tst_accessibility::a11y_data() // SwipeView // Tumbler - QTest::newRow("CalendarView") << "calendarview" << 0x0 << "CalendarView"; //QAccessible::NoRole QTest::newRow("DayOfWeekRow") << "dayofweekrow" << 0x0 << "DayOfWeekRow"; //QAccessible::NoRole + QTest::newRow("MonthGrid") << "monthgrid" << 0x0 << "MonthGrid"; //QAccessible::NoRole QTest::newRow("WeekNumberColumn") << "weeknumbercolumn" << 0x0 << "WeekNumberColumn"; //QAccessible::NoRole } @@ -111,8 +111,8 @@ void tst_accessibility::a11y() #ifdef QT_NO_ACCESSIBILITY if (name == QLatin1Literal("textarea") || name == QLatin1Literal("textfield") - || name == QLatin1Literal("calendarview") || name == QLatin1Literal("dayofweekrow") + || name == QLatin1Literal("monthgrid") || name == QLatin1Literal("weeknumbercolumn")) fn += QLatin1Literal("-2"); #endif |