From 98e7b3cca484df43838fe834dcaf1f97f45c659f Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 30 Sep 2015 17:06:27 +0200 Subject: Rename QtQuick.Calendar 2.0 to Qt.labs.calendar 1.0 Change-Id: Ief7e28f6c595cb60f15a4960dada24a6c2f5ca3e Reviewed-by: Mitch Curtis --- tests/auto/accessibility/data/calendarview-2.qml | 2 +- tests/auto/accessibility/data/calendarview.qml | 2 +- tests/auto/accessibility/data/dayofweekrow-2.qml | 2 +- tests/auto/accessibility/data/dayofweekrow.qml | 2 +- .../auto/accessibility/data/weeknumbercolumn-2.qml | 2 +- tests/auto/accessibility/data/weeknumbercolumn.qml | 2 +- tests/auto/calendar/data/tst_calendarview.qml | 2 +- tests/auto/calendar/data/tst_dayofweekrow.qml | 2 +- tests/auto/calendar/data/tst_weeknumbercolumn.qml | 2 +- tests/auto/sanity/tst_sanity.cpp | 2 +- .../calendarmodel/qtlabscalendar-calendarmodel.qml | 31 ++++++++++++++++++++ .../qtquickcalendar2-calendarmodel.qml | 31 -------------------- .../qtlabscalendar-calendarview-layout.qml | 34 ++++++++++++++++++++++ .../calendarview/qtlabscalendar-calendarview.qml | 10 +++++++ .../qtquickcalendar2-calendarview-layout.qml | 34 ---------------------- .../calendarview/qtquickcalendar2-calendarview.qml | 10 ------- .../qtlabscalendar-dayofweekrow-layout.qml | 20 +++++++++++++ .../dayofweekrow/qtlabscalendar-dayofweekrow.qml | 8 +++++ .../qtquickcalendar2-dayofweekrow-layout.qml | 20 ------------- .../dayofweekrow/qtquickcalendar2-dayofweekrow.qml | 8 ----- .../qtlabscalendar-weeknumbercolumn-layout.qml | 22 ++++++++++++++ .../qtlabscalendar-weeknumbercolumn.qml | 10 +++++++ .../qtquickcalendar2-weeknumbercolumn-layout.qml | 22 -------------- .../qtquickcalendar2-weeknumbercolumn.qml | 10 ------- tests/benchmarks/creationtime/tst_creationtime.cpp | 4 +-- 25 files changed, 147 insertions(+), 147 deletions(-) create mode 100644 tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml delete mode 100644 tests/auto/snippets/data/calendarmodel/qtquickcalendar2-calendarmodel.qml create mode 100644 tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml create mode 100644 tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml delete mode 100644 tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview-layout.qml delete mode 100644 tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview.qml create mode 100644 tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml create mode 100644 tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow.qml delete mode 100644 tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow-layout.qml delete mode 100644 tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow.qml create mode 100644 tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml create mode 100644 tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn.qml delete mode 100644 tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn-layout.qml delete mode 100644 tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn.qml (limited to 'tests') diff --git a/tests/auto/accessibility/data/calendarview-2.qml b/tests/auto/accessibility/data/calendarview-2.qml index ab4a2177..526662b7 100644 --- a/tests/auto/accessibility/data/calendarview-2.qml +++ b/tests/auto/accessibility/data/calendarview-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/calendarview.qml b/tests/auto/accessibility/data/calendarview.qml index 3b377ef6..f2452901 100644 --- a/tests/auto/accessibility/data/calendarview.qml +++ b/tests/auto/accessibility/data/calendarview.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/dayofweekrow-2.qml b/tests/auto/accessibility/data/dayofweekrow-2.qml index a562916a..26569836 100644 --- a/tests/auto/accessibility/data/dayofweekrow-2.qml +++ b/tests/auto/accessibility/data/dayofweekrow-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/dayofweekrow.qml b/tests/auto/accessibility/data/dayofweekrow.qml index dc6243ea..c799aba1 100644 --- a/tests/auto/accessibility/data/dayofweekrow.qml +++ b/tests/auto/accessibility/data/dayofweekrow.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/weeknumbercolumn-2.qml b/tests/auto/accessibility/data/weeknumbercolumn-2.qml index c6af782d..bc3b1739 100644 --- a/tests/auto/accessibility/data/weeknumbercolumn-2.qml +++ b/tests/auto/accessibility/data/weeknumbercolumn-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/weeknumbercolumn.qml b/tests/auto/accessibility/data/weeknumbercolumn.qml index 8728d6ea..7fadb5da 100644 --- a/tests/auto/accessibility/data/weeknumbercolumn.qml +++ b/tests/auto/accessibility/data/weeknumbercolumn.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 Window { visible: true diff --git a/tests/auto/calendar/data/tst_calendarview.qml b/tests/auto/calendar/data/tst_calendarview.qml index b605d664..ef1e4380 100644 --- a/tests/auto/calendar/data/tst_calendarview.qml +++ b/tests/auto/calendar/data/tst_calendarview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 TestCase { id: testCase diff --git a/tests/auto/calendar/data/tst_dayofweekrow.qml b/tests/auto/calendar/data/tst_dayofweekrow.qml index 04c6ef9e..4d332110 100644 --- a/tests/auto/calendar/data/tst_dayofweekrow.qml +++ b/tests/auto/calendar/data/tst_dayofweekrow.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 TestCase { id: testCase diff --git a/tests/auto/calendar/data/tst_weeknumbercolumn.qml b/tests/auto/calendar/data/tst_weeknumbercolumn.qml index 98465bf3..f0c84bc0 100644 --- a/tests/auto/calendar/data/tst_weeknumbercolumn.qml +++ b/tests/auto/calendar/data/tst_weeknumbercolumn.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 TestCase { id: testCase diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index 1b9eebdd..6568f0dc 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -147,7 +147,7 @@ void tst_Sanity::initTestCase() { QQmlEngine engine; foreach (const QString &path, engine.importPathList()) { - files.unite(listQmlFiles(QDir(path + "/QtQuick/Calendar.2"))); + files.unite(listQmlFiles(QDir(path + "/Qt/labs/calendar"))); files.unite(listQmlFiles(QDir(path + "/QtQuick/Controls.2"))); } } diff --git a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml new file mode 100644 index 00000000..3874ea44 --- /dev/null +++ b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml @@ -0,0 +1,31 @@ +import QtQuick 2.0 +import Qt.labs.calendar 1.0 +import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T + +//! [1] +ListView { + id: listview + + width: 200; height: 200 + snapMode: ListView.SnapOneItem + orientation: ListView.Horizontal + highlightRangeMode: ListView.StrictlyEnforceRange + + model: CalendarModel { + from: new Date(2015, 0, 1) + to: new Date(2015, 11, 31) + } + + delegate: CalendarView { + width: listview.width + height: listview.height + + month: model.month + year: model.year + locale: Qt.locale("en_US") + } + + T.ScrollIndicator.horizontal: ScrollIndicator { } +} +//! [1] diff --git a/tests/auto/snippets/data/calendarmodel/qtquickcalendar2-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtquickcalendar2-calendarmodel.qml deleted file mode 100644 index 357e5ced..00000000 --- a/tests/auto/snippets/data/calendarmodel/qtquickcalendar2-calendarmodel.qml +++ /dev/null @@ -1,31 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Calendar 2.0 -import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T - -//! [1] -ListView { - id: listview - - width: 200; height: 200 - snapMode: ListView.SnapOneItem - orientation: ListView.Horizontal - highlightRangeMode: ListView.StrictlyEnforceRange - - model: CalendarModel { - from: new Date(2015, 0, 1) - to: new Date(2015, 11, 31) - } - - delegate: CalendarView { - width: listview.width - height: listview.height - - month: model.month - year: model.year - locale: Qt.locale("en_US") - } - - T.ScrollIndicator.horizontal: ScrollIndicator { } -} -//! [1] diff --git a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml new file mode 100644 index 00000000..8aaddba6 --- /dev/null +++ b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml @@ -0,0 +1,34 @@ +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import Qt.labs.calendar 1.0 + +//! [1] +GridLayout { + columns: 2 + + DayOfWeekRow { + locale: view.locale + + Layout.column: 1 + Layout.fillWidth: true + } + + WeekNumberColumn { + month: view.month + year: view.year + locale: view.locale + + Layout.fillHeight: true + } + + CalendarView { + id: view + month: 12 + year: 2015 + locale: Qt.locale("en_US") + + Layout.fillWidth: true + Layout.fillHeight: true + } +} +//! [1] diff --git a/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml new file mode 100644 index 00000000..b853d635 --- /dev/null +++ b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import Qt.labs.calendar 1.0 + +//! [1] +CalendarView { + month: 12 + year: 2015 + locale: Qt.locale("en_US") +} +//! [1] diff --git a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview-layout.qml b/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview-layout.qml deleted file mode 100644 index 8aba4e02..00000000 --- a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview-layout.qml +++ /dev/null @@ -1,34 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Calendar 2.0 - -//! [1] -GridLayout { - columns: 2 - - DayOfWeekRow { - locale: view.locale - - Layout.column: 1 - Layout.fillWidth: true - } - - WeekNumberColumn { - month: view.month - year: view.year - locale: view.locale - - Layout.fillHeight: true - } - - CalendarView { - id: view - month: 12 - year: 2015 - locale: Qt.locale("en_US") - - Layout.fillWidth: true - Layout.fillHeight: true - } -} -//! [1] diff --git a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview.qml b/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview.qml deleted file mode 100644 index 1795668f..00000000 --- a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Calendar 2.0 - -//! [1] -CalendarView { - month: 12 - year: 2015 - locale: Qt.locale("en_US") -} -//! [1] diff --git a/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml new file mode 100644 index 00000000..d013b167 --- /dev/null +++ b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml @@ -0,0 +1,20 @@ +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import Qt.labs.calendar 1.0 + +//! [1] +ColumnLayout { + DayOfWeekRow { + locale: view.locale + Layout.fillWidth: true + } + + CalendarView { + id: view + month: 12 + year: 2015 + locale: Qt.locale("en_US") + Layout.fillWidth: true + } +} +//! [1] diff --git a/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow.qml b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow.qml new file mode 100644 index 00000000..7d6f159f --- /dev/null +++ b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow.qml @@ -0,0 +1,8 @@ +import QtQuick 2.0 +import Qt.labs.calendar 1.0 + +//! [1] +DayOfWeekRow { + locale: Qt.locale("en_US") +} +//! [1] diff --git a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow-layout.qml b/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow-layout.qml deleted file mode 100644 index cb4fa2f3..00000000 --- a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow-layout.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Calendar 2.0 - -//! [1] -ColumnLayout { - DayOfWeekRow { - locale: view.locale - Layout.fillWidth: true - } - - CalendarView { - id: view - month: 12 - year: 2015 - locale: Qt.locale("en_US") - Layout.fillWidth: true - } -} -//! [1] diff --git a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow.qml b/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow.qml deleted file mode 100644 index e600e9c3..00000000 --- a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Calendar 2.0 - -//! [1] -DayOfWeekRow { - locale: Qt.locale("en_US") -} -//! [1] diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml new file mode 100644 index 00000000..479b069c --- /dev/null +++ b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml @@ -0,0 +1,22 @@ +import QtQuick 2.0 +import QtQuick.Layouts 1.0 +import Qt.labs.calendar 1.0 + +//! [1] +RowLayout { + WeekNumberColumn { + month: 12 + year: 2015 + locale: view.locale + Layout.fillHeight: true + } + + CalendarView { + id: view + month: 12 + year: 2015 + locale: Qt.locale("en_US") + Layout.fillHeight: true + } +} +//! [1] diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn.qml b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn.qml new file mode 100644 index 00000000..eaa50bff --- /dev/null +++ b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import Qt.labs.calendar 1.0 + +//! [1] +WeekNumberColumn { + month: 12 + year: 2015 + locale: Qt.locale("en_US") +} +//! [1] diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn-layout.qml b/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn-layout.qml deleted file mode 100644 index f954c2af..00000000 --- a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn-layout.qml +++ /dev/null @@ -1,22 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Layouts 1.0 -import QtQuick.Calendar 2.0 - -//! [1] -RowLayout { - WeekNumberColumn { - month: 12 - year: 2015 - locale: view.locale - Layout.fillHeight: true - } - - CalendarView { - id: view - month: 12 - year: 2015 - locale: Qt.locale("en_US") - Layout.fillHeight: true - } -} -//! [1] diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn.qml b/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn.qml deleted file mode 100644 index a36fe2a2..00000000 --- a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Calendar 2.0 - -//! [1] -WeekNumberColumn { - month: 12 - year: 2015 - locale: Qt.locale("en_US") -} -//! [1] diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index 9185d5b5..5d8d9b1c 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -115,14 +115,14 @@ void tst_CreationTime::calendar() { QFETCH(QByteArray, control); QQmlComponent component(&engine); - component.setData("import QtQuick.Calendar 2.0;" + control + "{}", QUrl()); + component.setData("import Qt.labs.calendar 1.0;" + control + "{}", QUrl()); doBenchmark(&component); } void tst_CreationTime::calendar_data() { QTest::addColumn("control"); - addTestRows(engine.importPathList(), "QtQuick/Calendar.2"); + addTestRows(engine.importPathList(), "Qt/labs/calendar"); } QTEST_MAIN(tst_CreationTime) -- cgit v1.2.3