summaryrefslogtreecommitdiff
path: root/tests/manual
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2013-08-30 12:13:31 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-10 11:20:29 +0200
commit0e4a9eba4052c4ad447b06c4575c30f77b4f3237 (patch)
treec56717ed57ce17ac96cde788b1c92e4879375428 /tests/manual
parent37b0b8176537923ec77621c114e8ac2deb307b33 (diff)
downloadqtquickcontrols-0e4a9eba4052c4ad447b06c4575c30f77b4f3237.tar.gz
Update imports to 1.1 and remove version from qmlmodule definition
Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/ContextMenu.qml2
-rw-r--r--tests/manual/Layout.qml2
-rw-r--r--tests/manual/StackView.qml2
-rw-r--r--tests/manual/WindowContextMenu.qml2
-rw-r--r--tests/manual/scrollview/main.qml2
-rw-r--r--tests/manual/splitter.qml2
-rw-r--r--tests/manual/stackview/ButtonMenu.qml2
-rw-r--r--tests/manual/stackview/View.qml2
-rw-r--r--tests/manual/stackview/main.qml2
-rw-r--r--tests/manual/stretching.qml4
-rw-r--r--tests/manual/stretchingcustom.qml4
-rw-r--r--tests/manual/tableviewmodels/qml/main.qml2
-rw-r--r--tests/manual/testbench/content/Components.qml4
-rw-r--r--tests/manual/testbench/content/PropertyLayouts.qml2
-rw-r--r--tests/manual/testbench/main.qml22
15 files changed, 28 insertions, 28 deletions
diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml
index 2786bc83..1d68068f 100644
--- a/tests/manual/ContextMenu.qml
+++ b/tests/manual/ContextMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Rectangle {
diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml
index 8f2ccedd..78c783ea 100644
--- a/tests/manual/Layout.qml
+++ b/tests/manual/Layout.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
Item {
diff --git a/tests/manual/StackView.qml b/tests/manual/StackView.qml
index dc86e2f9..8769e9a6 100644
--- a/tests/manual/StackView.qml
+++ b/tests/manual/StackView.qml
@@ -40,7 +40,7 @@
import QtQuick 2.1
import QtQuick.Window 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Window {
width: 480
diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml
index ec9af904..7e6ef0f5 100644
--- a/tests/manual/WindowContextMenu.qml
+++ b/tests/manual/WindowContextMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Window 2.1
Window {
diff --git a/tests/manual/scrollview/main.qml b/tests/manual/scrollview/main.qml
index a245ca88..69baf8ba 100644
--- a/tests/manual/scrollview/main.qml
+++ b/tests/manual/scrollview/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ApplicationWindow {
diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml
index e4b08e70..768a9607 100644
--- a/tests/manual/splitter.qml
+++ b/tests/manual/splitter.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
ApplicationWindow {
width: 400
diff --git a/tests/manual/stackview/ButtonMenu.qml b/tests/manual/stackview/ButtonMenu.qml
index f10490e7..355c76db 100644
--- a/tests/manual/stackview/ButtonMenu.qml
+++ b/tests/manual/stackview/ButtonMenu.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
GridLayout {
diff --git a/tests/manual/stackview/View.qml b/tests/manual/stackview/View.qml
index 858bac61..ec844c90 100644
--- a/tests/manual/stackview/View.qml
+++ b/tests/manual/stackview/View.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ColumnLayout {
diff --git a/tests/manual/stackview/main.qml b/tests/manual/stackview/main.qml
index f81c8309..caf30f80 100644
--- a/tests/manual/stackview/main.qml
+++ b/tests/manual/stackview/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
ApplicationWindow {
diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml
index a8d86eb3..29ee0599 100644
--- a/tests/manual/stretching.qml
+++ b/tests/manual/stretching.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
Rectangle {
width: 600
diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml
index fa56757f..b21162f3 100644
--- a/tests/manual/stretchingcustom.qml
+++ b/tests/manual/stretchingcustom.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
Rectangle {
width: 600
diff --git a/tests/manual/tableviewmodels/qml/main.qml b/tests/manual/tableviewmodels/qml/main.qml
index f9da0f68..d8130a5c 100644
--- a/tests/manual/tableviewmodels/qml/main.qml
+++ b/tests/manual/tableviewmodels/qml/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
Rectangle {
width: 360
diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml
index af5dcd00..e9d91fa2 100644
--- a/tests/manual/testbench/content/Components.qml
+++ b/tests/manual/testbench/content/Components.qml
@@ -39,8 +39,8 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
Item {
diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml
index 05061fcc..ef569757 100644
--- a/tests/manual/testbench/content/PropertyLayouts.qml
+++ b/tests/manual/testbench/content/PropertyLayouts.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
QtObject {
diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml
index df7cea9b..24acb111 100644
--- a/tests/manual/testbench/main.qml
+++ b/tests/manual/testbench/main.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
import "content"
@@ -256,7 +256,7 @@ ApplicationWindow {
case "horizontalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignLeft", value: TextEdit.AlignLeft});
enumModelData.append({ text: "TextEdit.AlignRight", value: TextEdit.AlignRight});
@@ -265,7 +265,7 @@ ApplicationWindow {
case "textFormat":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText});
enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText});
@@ -274,7 +274,7 @@ ApplicationWindow {
case "verticalAlignment":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.AlignTop", value: TextEdit.AlignTop});
enumModelData.append({ text: "TextEdit.AlignBottom", value: TextEdit.AlignBottom});
@@ -283,7 +283,7 @@ ApplicationWindow {
case "textFormat":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText});
enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText});
@@ -292,7 +292,7 @@ ApplicationWindow {
case "inputMethodHints":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.ImhNone", value: Qt.ImhNone});
enumModelData.append({ text: "Qt.ImhHiddenText", value: Qt.ImhHiddenText});
@@ -315,7 +315,7 @@ ApplicationWindow {
case "orientation":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.Horizontal", value: Qt.Horizontal});
enumModelData.append({ text: "Qt.Vertical", value: Qt.Vertical});
@@ -323,7 +323,7 @@ ApplicationWindow {
case "echoMode":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "TextInput.Normal", value: TextInput.Normal});
enumModelData.append({ text: "TextInput.Password", value: TextInput.Password});
@@ -335,7 +335,7 @@ ApplicationWindow {
case "textColor":
isColor = true
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Amber", value: "#FF7E00"});
enumModelData.append({ text: "Azure", value: "#007FFF"});
@@ -344,7 +344,7 @@ ApplicationWindow {
case "sortIndicatorOrder":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.AscendingOrder", value: Qt.AscendingOrder});
enumModelData.append({ text: "Qt.DescendingOrder", value: Qt.DescendingOrder});
@@ -352,7 +352,7 @@ ApplicationWindow {
case "checkedState":
layout = layouts.enumLayout
- enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, '');
+ enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ListModel {}', layout, '');
typeName = "Enum";
enumModelData.append({ text: "Qt.Checked", value: Qt.Checked});
enumModelData.append({ text: "Qt.Unchecked", value: Qt.Unchecked});
View Lorry Controller Status