diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 13:51:20 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 14:09:05 +0000 |
| commit | 6b61cc32deaa202e7f46f4be426329db6a40ac3f (patch) | |
| tree | 88056961b1ecc947e7b89f8ea5e7287f35848753 /tests | |
| parent | b44194ecc62e7c2d51a90bad17a41451319f7c1f (diff) | |
import Qt.labs.templates 1.0 => QtQuick.Templates 2.0
Even though there never was such thing is QtQuick.Templates 1.0,
we'll use version 2.0 to keep it in sync with QtQuick.Controls 2.0
(next step). The templates define (and in the future, revision) the
API of the controls, so the two must have the same version or it
will get messy.
Docs and plugins.qmltypes will be updated in follow up commits.
Change-Id: Idc2e76f32f348ba35eb4b1fa167c6868300aa910
Task-number: QTBUG-52549
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/applicationwindow/data/font.qml | 2 | ||||
| -rw-r--r-- | tests/auto/applicationwindow/data/locale.qml | 2 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_control.qml | 2 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_popup.qml | 2 | ||||
| -rw-r--r-- | tests/manual/fonts/main.qml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/applicationwindow/data/font.qml b/tests/auto/applicationwindow/data/font.qml index 277ee1f2..96f0c025 100644 --- a/tests/auto/applicationwindow/data/font.qml +++ b/tests/auto/applicationwindow/data/font.qml @@ -40,7 +40,7 @@ import QtQuick 2.6 import Qt.labs.controls 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/applicationwindow/data/locale.qml b/tests/auto/applicationwindow/data/locale.qml index 59c42f85..09e4293b 100644 --- a/tests/auto/applicationwindow/data/locale.qml +++ b/tests/auto/applicationwindow/data/locale.qml @@ -40,7 +40,7 @@ import QtQuick 2.6 import Qt.labs.controls 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index 5e795feb..30b53356 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -41,7 +41,7 @@ import QtQuick 2.2 import QtTest 1.0 import Qt.labs.controls 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index 09d43466..18e94810 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -41,7 +41,7 @@ import QtQuick 2.4 import QtTest 1.0 import Qt.labs.controls 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T TestCase { id: testCase diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml index 7bf9a0a7..52908a3d 100644 --- a/tests/manual/fonts/main.qml +++ b/tests/manual/fonts/main.qml @@ -40,7 +40,7 @@ import QtQuick 2.6 import Qt.labs.controls 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import QtQuick.Layouts 1.2 ApplicationWindow { |