From 1ef2c051ec88c5579634f05f5983694a868b8efa Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 21 Apr 2016 14:19:23 +0200 Subject: import Qt.labs.controls 1.0 => QtQuick.Controls 2.0 Docs, resources, .metainfo and plugins.qmltypes will be updated in follow up commits. Change-Id: I4438c5bfb8802bff0fa15c56431cfd288f179861 Task-number: QTBUG-52549 Reviewed-by: J-P Nurmi --- tests/auto/applicationwindow/data/activeFocusControl.qml | 2 +- tests/auto/applicationwindow/data/activefocusontab.qml | 2 +- tests/auto/applicationwindow/data/attachedProperties.qml | 2 +- tests/auto/applicationwindow/data/basicapplicationwindow.qml | 2 +- tests/auto/applicationwindow/data/defaultFocus.qml | 2 +- tests/auto/applicationwindow/data/fill.qml | 2 +- tests/auto/applicationwindow/data/font.qml | 2 +- tests/auto/applicationwindow/data/locale.qml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/auto/applicationwindow/data') diff --git a/tests/auto/applicationwindow/data/activeFocusControl.qml b/tests/auto/applicationwindow/data/activeFocusControl.qml index 51b3241f..b407a91b 100644 --- a/tests/auto/applicationwindow/data/activeFocusControl.qml +++ b/tests/auto/applicationwindow/data/activeFocusControl.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/applicationwindow/data/activefocusontab.qml index 1ff677fc..6cbd132f 100644 --- a/tests/auto/applicationwindow/data/activefocusontab.qml +++ b/tests/auto/applicationwindow/data/activefocusontab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/attachedProperties.qml b/tests/auto/applicationwindow/data/attachedProperties.qml index 72707537..0e518a0b 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 Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 ApplicationWindow { property alias childControl: childControl diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/applicationwindow/data/basicapplicationwindow.qml index 72266cf6..afac65f3 100644 --- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/applicationwindow/data/basicapplicationwindow.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/defaultFocus.qml b/tests/auto/applicationwindow/data/defaultFocus.qml index ff4e4e4c..ed2a9303 100644 --- a/tests/auto/applicationwindow/data/defaultFocus.qml +++ b/tests/auto/applicationwindow/data/defaultFocus.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 ApplicationWindow { visible: true diff --git a/tests/auto/applicationwindow/data/fill.qml b/tests/auto/applicationwindow/data/fill.qml index 2a9c7bad..02d413b7 100644 --- a/tests/auto/applicationwindow/data/fill.qml +++ b/tests/auto/applicationwindow/data/fill.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 ApplicationWindow { width: 400 diff --git a/tests/auto/applicationwindow/data/font.qml b/tests/auto/applicationwindow/data/font.qml index 96f0c025..0bc744b1 100644 --- a/tests/auto/applicationwindow/data/font.qml +++ b/tests/auto/applicationwindow/data/font.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 import QtQuick.Templates 2.0 as T ApplicationWindow { diff --git a/tests/auto/applicationwindow/data/locale.qml b/tests/auto/applicationwindow/data/locale.qml index 09e4293b..d6d46a0d 100644 --- a/tests/auto/applicationwindow/data/locale.qml +++ b/tests/auto/applicationwindow/data/locale.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.controls 1.0 +import QtQuick.Controls 2.0 import QtQuick.Templates 2.0 as T ApplicationWindow { -- cgit v1.2.3