diff options
Diffstat (limited to 'tests')
18 files changed, 19 insertions, 19 deletions
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/qtquickcalendar2-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml index 357e5ced..3874ea44 100644 --- a/tests/auto/snippets/data/calendarmodel/qtquickcalendar2-calendarmodel.qml +++ b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 import QtQuick.Controls 2.0 import QtQuick.Templates 2.0 as T diff --git a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview-layout.qml b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml index 8aba4e02..8aaddba6 100644 --- a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview-layout.qml +++ b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview-layout.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] GridLayout { diff --git a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview.qml b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml index 1795668f..b853d635 100644 --- a/tests/auto/snippets/data/calendarview/qtquickcalendar2-calendarview.qml +++ b/tests/auto/snippets/data/calendarview/qtlabscalendar-calendarview.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] CalendarView { diff --git a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow-layout.qml b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml index cb4fa2f3..d013b167 100644 --- a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow-layout.qml +++ b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow-layout.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] ColumnLayout { diff --git a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow.qml b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow.qml index e600e9c3..7d6f159f 100644 --- a/tests/auto/snippets/data/dayofweekrow/qtquickcalendar2-dayofweekrow.qml +++ b/tests/auto/snippets/data/dayofweekrow/qtlabscalendar-dayofweekrow.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] DayOfWeekRow { diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn-layout.qml b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml index f954c2af..479b069c 100644 --- a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn-layout.qml +++ b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn-layout.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtQuick.Layouts 1.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] RowLayout { diff --git a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn.qml b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn.qml index a36fe2a2..eaa50bff 100644 --- a/tests/auto/snippets/data/weeknumbercolumn/qtquickcalendar2-weeknumbercolumn.qml +++ b/tests/auto/snippets/data/weeknumbercolumn/qtlabscalendar-weeknumbercolumn.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtQuick.Calendar 2.0 +import Qt.labs.calendar 1.0 //! [1] WeekNumberColumn { 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<QByteArray>("control"); - addTestRows(engine.importPathList(), "QtQuick/Calendar.2"); + addTestRows(engine.importPathList(), "Qt/labs/calendar"); } QTEST_MAIN(tst_CreationTime) |