diff options
Diffstat (limited to 'tests/auto')
9 files changed, 31 insertions, 31 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 diff --git a/tests/auto/calendar/data/tst_calendarview.qml b/tests/auto/calendar/data/tst_monthgrid.qml index 8bb702c5..d07b77db 100644 --- a/tests/auto/calendar/data/tst_calendarview.qml +++ b/tests/auto/calendar/data/tst_monthgrid.qml @@ -48,11 +48,11 @@ TestCase { height: 400 visible: true when: windowShown - name: "CalendarView" + name: "MonthGrid" Component { id: component - CalendarView { } + MonthGrid { } } function test_locale() { @@ -103,28 +103,28 @@ TestCase { control.month = 0 compare(control.month, 0) - ignoreWarning(Qt.resolvedUrl("tst_calendarview.qml") + ":55:9: QML AbstractCalendarView: month -1 is out of range [0...11]") + ignoreWarning(Qt.resolvedUrl("tst_monthgrid.qml") + ":55:9: QML AbstractMonthGrid: month -1 is out of range [0...11]") control.month = -1 compare(control.month, 0) control.month = 11 compare(control.month, 11) - ignoreWarning(Qt.resolvedUrl("tst_calendarview.qml") + ":55:9: QML AbstractCalendarView: month 12 is out of range [0...11]") + ignoreWarning(Qt.resolvedUrl("tst_monthgrid.qml") + ":55:9: QML AbstractMonthGrid: month 12 is out of range [0...11]") control.month = 12 compare(control.month, 11) control.year = -271820 compare(control.year, -271820) - ignoreWarning(Qt.resolvedUrl("tst_calendarview.qml") + ":55:9: QML AbstractCalendarView: year -271821 is out of range [-271820...275759]") + ignoreWarning(Qt.resolvedUrl("tst_monthgrid.qml") + ":55:9: QML AbstractMonthGrid: year -271821 is out of range [-271820...275759]") control.year = -271821 compare(control.year, -271820) control.year = 275759 compare(control.year, 275759) - ignoreWarning(Qt.resolvedUrl("tst_calendarview.qml") + ":55:9: QML AbstractCalendarView: year 275760 is out of range [-271820...275759]") + ignoreWarning(Qt.resolvedUrl("tst_monthgrid.qml") + ":55:9: QML AbstractMonthGrid: year 275760 is out of range [-271820...275759]") control.year = 275760 compare(control.year, 275759) diff --git a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml index ca13e815..200ac5f4 100644 --- a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml +++ b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml @@ -17,7 +17,7 @@ ListView { to: new Date(2015, 11, 31) } - delegate: CalendarView { + delegate: MonthGrid { width: listview.width height: listview.height diff --git a/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml index 88267b2c..e30208d7 100644 --- a/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml +++ b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml @@ -5,12 +5,12 @@ import Qt.labs.calendar 1.0 //! [1] ColumnLayout { DayOfWeekRow { - locale: view.locale + locale: grid.locale Layout.fillWidth: true } - CalendarView { - id: view + MonthGrid { + id: grid month: 11 year: 2015 locale: Qt.locale("en_US") diff --git a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml b/tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid-layout.qml index ec32368b..f250650d 100644 --- a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml +++ b/tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid-layout.qml @@ -14,15 +14,15 @@ GridLayout { } WeekNumberColumn { - month: view.month - year: view.year - locale: view.locale + month: grid.month + year: grid.year + locale: grid.locale Layout.fillHeight: true } - CalendarView { - id: view + MonthGrid { + id: grid month: 11 year: 2015 locale: Qt.locale("en_US") diff --git a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml b/tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid.qml index e1cad178..1b5b90ce 100644 --- a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml +++ b/tests/auto/snippets/data/monthgrid/qtlabscalendar-monthgrid.qml @@ -2,7 +2,7 @@ import QtQuick 2.0 import Qt.labs.calendar 1.0 //! [1] -CalendarView { +MonthGrid { month: 11 year: 2015 locale: Qt.locale("en_US") diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml index 47a260fa..228dd4f5 100644 --- a/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml +++ b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml @@ -5,14 +5,14 @@ import Qt.labs.calendar 1.0 //! [1] RowLayout { WeekNumberColumn { - month: view.month - year: view.year - locale: view.locale + month: grid.month + year: grid.year + locale: grid.locale Layout.fillHeight: true } - CalendarView { - id: view + MonthGrid { + id: grid month: 11 year: 2015 locale: Qt.locale("en_US") |