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/applicationwindow | |
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/applicationwindow')
10 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/applicationwindow/data/activeFocusControl.qml b/tests/auto/applicationwindow/data/activeFocusControl.qml index b407a91b..8a206aaf 100644 --- a/tests/auto/applicationwindow/data/activeFocusControl.qml +++ b/tests/auto/applicationwindow/data/activeFocusControl.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/applicationwindow/data/activefocusontab.qml index 6cbd132f..dc4d2ddb 100644 --- a/tests/auto/applicationwindow/data/activefocusontab.qml +++ b/tests/auto/applicationwindow/data/activefocusontab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/attachedProperties.qml b/tests/auto/applicationwindow/data/attachedProperties.qml index 0e518a0b..dd14c30c 100644 --- a/tests/auto/applicationwindow/data/attachedProperties.qml +++ b/tests/auto/applicationwindow/data/attachedProperties.qml @@ -40,7 +40,7 @@ import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ApplicationWindow { property alias childControl: childControl diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/applicationwindow/data/basicapplicationwindow.qml index afac65f3..f53035d9 100644 --- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/applicationwindow/data/basicapplicationwindow.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/defaultFocus.qml b/tests/auto/applicationwindow/data/defaultFocus.qml index ed2a9303..9839e15c 100644 --- a/tests/auto/applicationwindow/data/defaultFocus.qml +++ b/tests/auto/applicationwindow/data/defaultFocus.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ApplicationWindow { visible: true diff --git a/tests/auto/applicationwindow/data/fill.qml b/tests/auto/applicationwindow/data/fill.qml index 02d413b7..ef228e66 100644 --- a/tests/auto/applicationwindow/data/fill.qml +++ b/tests/auto/applicationwindow/data/fill.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ApplicationWindow { width: 400 diff --git a/tests/auto/applicationwindow/data/focusAfterPopupClosed.qml b/tests/auto/applicationwindow/data/focusAfterPopupClosed.qml index 629e0cf9..b500c29b 100644 --- a/tests/auto/applicationwindow/data/focusAfterPopupClosed.qml +++ b/tests/auto/applicationwindow/data/focusAfterPopupClosed.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick.Controls 2.1 ApplicationWindow { width: 200 diff --git a/tests/auto/applicationwindow/data/font.qml b/tests/auto/applicationwindow/data/font.qml index 0bc744b1..d6055de4 100644 --- a/tests/auto/applicationwindow/data/font.qml +++ b/tests/auto/applicationwindow/data/font.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import QtQuick.Controls 2.1 +import QtQuick.Templates 2.1 as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/applicationwindow/data/locale.qml b/tests/auto/applicationwindow/data/locale.qml index d6d46a0d..cb6cb555 100644 --- a/tests/auto/applicationwindow/data/locale.qml +++ b/tests/auto/applicationwindow/data/locale.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import QtQuick.Controls 2.1 +import QtQuick.Templates 2.1 as T ApplicationWindow { objectName: "appWin" diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp index bec8aa81..97fa767f 100644 --- a/tests/auto/applicationwindow/tst_applicationwindow.cpp +++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp @@ -522,7 +522,7 @@ void tst_applicationwindow::defaultFont() QQmlEngine engine; QQmlComponent component(&engine); - component.setData("import QtQuick.Controls 2.0; ApplicationWindow { }", QUrl()); + component.setData("import QtQuick.Controls 2.1; ApplicationWindow { }", QUrl()); QScopedPointer<QQuickApplicationWindow> window; window.reset(static_cast<QQuickApplicationWindow *>(component.create())); |