diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-07 16:04:29 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-07-08 07:37:33 +0000 |
| commit | 7af626e08cc21463a86d0d0614d4aeb9c036643d (patch) | |
| tree | 775e8b1b4233d5426e95da56f4f614abfc359b54 /tests/auto/focus | |
| parent | 8024cb734c07a5c29a12f75d74fa1333f203ca47 (diff) | |
Bump up all controls and templates imports to version 2.1
Controls must import templates version 2.1 in order to "inherit"
1-revisioned properties, methods, and signals. So far, this has
been done case by case, but it's less error prone and more clear
to change them all. For example, if you ever see a source file
pasted/linked somewhere, it's easy to identify the version it
belongs to.
Change-Id: I41609ec1a22bc05ac3e79f953a147ca42d9e0786
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/focus')
| -rw-r--r-- | tests/auto/focus/data/activeFocusOnTab.qml | 2 | ||||
| -rw-r--r-- | tests/auto/focus/data/keyNavigation.qml | 2 | ||||
| -rw-r--r-- | tests/auto/focus/tst_focus.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/focus/data/activeFocusOnTab.qml b/tests/auto/focus/data/activeFocusOnTab.qml index 249cdba9..08cf6e3e 100644 --- a/tests/auto/focus/data/activeFocusOnTab.qml +++ b/tests/auto/focus/data/activeFocusOnTab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { id: main diff --git a/tests/auto/focus/data/keyNavigation.qml b/tests/auto/focus/data/keyNavigation.qml index 3be791b5..d17d79f3 100644 --- a/tests/auto/focus/data/keyNavigation.qml +++ b/tests/auto/focus/data/keyNavigation.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 Item { id: main diff --git a/tests/auto/focus/tst_focus.cpp b/tests/auto/focus/tst_focus.cpp index 2c9573c6..cab2625a 100644 --- a/tests/auto/focus/tst_focus.cpp +++ b/tests/auto/focus/tst_focus.cpp @@ -124,7 +124,7 @@ void tst_focus::policy() { QQmlEngine engine; QQmlComponent component(&engine); - component.setData("import QtQuick.Controls 2.0; ApplicationWindow { width: 100; height: 100; Control { anchors.fill: parent } }", QUrl()); + component.setData("import QtQuick.Controls 2.1; ApplicationWindow { width: 100; height: 100; Control { anchors.fill: parent } }", QUrl()); QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(component.create())); QVERIFY(window); @@ -207,7 +207,7 @@ void tst_focus::reason() QQmlEngine engine; QQmlComponent component(&engine); - component.setData(QString("import QtQuick.Controls 2.0; ApplicationWindow { width: 100; height: 100; %1 { anchors.fill: parent } }").arg(name).toUtf8(), QUrl()); + component.setData(QString("import QtQuick.Controls 2.1; ApplicationWindow { width: 100; height: 100; %1 { anchors.fill: parent } }").arg(name).toUtf8(), QUrl()); QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(component.create())); QVERIFY(window.data()); |