aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/calendar
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-02 23:03:58 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-10-04 10:56:24 +0000
commit1862fc5a32fd0523a56d24f2f90df3d9f54ba967 (patch)
tree6b80f228ceef64cf5a42a3d9a016ed28172cc18c /tests/auto/calendar
parent0cb096251c4f5af79126e71cfa7a7f9e910dac95 (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/calendar')
-rw-r--r--tests/auto/calendar/data/tst_monthgrid.qml (renamed from tests/auto/calendar/data/tst_calendarview.qml)12
1 files changed, 6 insertions, 6 deletions
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)