diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-30 17:47:36 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-01 09:03:42 +0000 |
commit | 3f2ac678971694fe6144a4e15197aff2ca38639b (patch) | |
tree | 06440cbf63932fb008f3aab29835b07d0310bada /tests/manual | |
parent | b948c83255239a6fe49fca58a98f90e796ce9047 (diff) |
Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0
Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/fonts/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-busyindicator.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-button.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-button.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-slider.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-slider.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-switch.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-switch.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-tabbar.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-tabbar.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml (renamed from tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml) | 2 | ||||
-rw-r--r-- | tests/manual/gifs/gifrecorder.cpp | 2 | ||||
-rw-r--r-- | tests/manual/gifs/tst_gifs.cpp | 12 |
9 files changed, 14 insertions, 14 deletions
diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml index 1654e93c..e429cbfd 100644 --- a/tests/manual/fonts/main.qml +++ b/tests/manual/fonts/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T import QtQuick.Layouts 1.2 diff --git a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/gifs/data/qtlabscontrols-busyindicator.qml index ad659ade..8b6940cc 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml +++ b/tests/manual/gifs/data/qtlabscontrols-busyindicator.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Item { width: busyIndicator.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-button.qml b/tests/manual/gifs/data/qtlabscontrols-button.qml index 46ef9bc5..c536d1e1 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-button.qml +++ b/tests/manual/gifs/data/qtlabscontrols-button.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Button { text: pressed ? "Pressed" : "Normal" diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/gifs/data/qtlabscontrols-slider.qml index 0a26df86..82cd3ad9 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-slider.qml +++ b/tests/manual/gifs/data/qtlabscontrols-slider.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Item { width: slider.implicitWidth diff --git a/tests/manual/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/gifs/data/qtlabscontrols-switch.qml index f1c6daab..01818ba8 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-switch.qml +++ b/tests/manual/gifs/data/qtlabscontrols-switch.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Switch { } diff --git a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/gifs/data/qtlabscontrols-tabbar.qml index 9f5bd797..c7a8653f 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml +++ b/tests/manual/gifs/data/qtlabscontrols-tabbar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Item { width: 200 diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml index 985c64c4..8576f09b 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml +++ b/tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T Item { diff --git a/tests/manual/gifs/gifrecorder.cpp b/tests/manual/gifs/gifrecorder.cpp index 8d1b6a8c..302dbec3 100644 --- a/tests/manual/gifs/gifrecorder.cpp +++ b/tests/manual/gifs/gifrecorder.cpp @@ -232,7 +232,7 @@ void GifRecorder::waitForFinish() if (mHighQuality) { // Indicate the end of recording and the beginning of conversion. QQmlComponent busyComponent(mView->engine()); - busyComponent.setData("import QtQuick 2.6; import QtQuick.Controls 2.0; Rectangle { anchors.fill: parent; " \ + busyComponent.setData("import QtQuick 2.6; import Qt.labs.controls 1.0; Rectangle { anchors.fill: parent; " \ "BusyIndicator { width: 32; height: 32; anchors.centerIn: parent } }", QUrl()); QCOMPARE(busyComponent.status(), QQmlComponent::Ready); QQuickItem *busyRect = qobject_cast<QQuickItem*>(busyComponent.create()); diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp index a74fa894..df636cd2 100644 --- a/tests/manual/gifs/tst_gifs.cpp +++ b/tests/manual/gifs/tst_gifs.cpp @@ -81,7 +81,7 @@ void tst_Gifs::tumblerWrap() gifRecorder.setDataDirPath(dataDirPath); gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(4); - gifRecorder.setQmlFileName("qtquickcontrols2-tumbler-wrap.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-tumbler-wrap.qml"); gifRecorder.setView(&view); view.show(); @@ -154,7 +154,7 @@ void tst_Gifs::slider() gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(4); gifRecorder.setHighQuality(true); - gifRecorder.setQmlFileName("qtquickcontrols2-slider.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-slider.qml"); gifRecorder.setView(&view); view.show(); @@ -273,7 +273,7 @@ void tst_Gifs::busyIndicator() gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(3); gifRecorder.setHighQuality(true); - gifRecorder.setQmlFileName("qtquickcontrols2-busyindicator.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-busyindicator.qml"); gifRecorder.setView(&view); view.show(); @@ -302,7 +302,7 @@ void tst_Gifs::switchGif() gifRecorder.setDataDirPath(dataDirPath); gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(3); - gifRecorder.setQmlFileName("qtquickcontrols2-switch.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-switch.qml"); gifRecorder.setHighQuality(true); gifRecorder.setView(&view); @@ -322,7 +322,7 @@ void tst_Gifs::button() gifRecorder.setDataDirPath(dataDirPath); gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(3); - gifRecorder.setQmlFileName("qtquickcontrols2-button.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-button.qml"); gifRecorder.setHighQuality(true); gifRecorder.setView(&view); @@ -338,7 +338,7 @@ void tst_Gifs::button() void tst_Gifs::tabBar() { - const QString qmlFileName = QStringLiteral("qtquickcontrols2-tabbar.qml"); + const QString qmlFileName = QStringLiteral("qtlabscontrols-tabbar.qml"); GifRecorder gifRecorder; gifRecorder.setDataDirPath(dataDirPath); |