diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-04-07 10:37:35 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 15:17:02 +0200 |
commit | 953b8d7ed82f2701ba8f6f572e60468da544c5ec (patch) | |
tree | a5f2d6b69c9f3ea65c427120f4f2c07d2d3db6e7 /tests/manual | |
parent | 9b206d4b0836f0f89aa667b44c6ac0a963808366 (diff) | |
download | qtquickcontrols-953b8d7ed82f2701ba8f6f572e60468da544c5ec.tar.gz |
Bump QtQuick.Controls import version to 1.2
Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/ApplicationWindow/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/ContextMenu.qml | 2 | ||||
-rw-r--r-- | tests/manual/Layout.qml | 2 | ||||
-rw-r--r-- | tests/manual/StackView.qml | 2 | ||||
-rw-r--r-- | tests/manual/WindowContextMenu.qml | 2 | ||||
-rw-r--r-- | tests/manual/baselines/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/combobox/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/popupwindowkeyevents.qml | 2 | ||||
-rw-r--r-- | tests/manual/scrollview/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/splitter.qml | 2 | ||||
-rw-r--r-- | tests/manual/stackview/ButtonMenu.qml | 2 | ||||
-rw-r--r-- | tests/manual/stackview/View.qml | 2 | ||||
-rw-r--r-- | tests/manual/stackview/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/stretching.qml | 2 | ||||
-rw-r--r-- | tests/manual/stretchingcustom.qml | 2 | ||||
-rw-r--r-- | tests/manual/tableviewmodels/qml/main.qml | 2 | ||||
-rw-r--r-- | tests/manual/testbench/content/PropertyLayouts.qml | 2 | ||||
-rw-r--r-- | tests/manual/testbench/main.qml | 20 |
18 files changed, 27 insertions, 27 deletions
diff --git a/tests/manual/ApplicationWindow/main.qml b/tests/manual/ApplicationWindow/main.qml index c4330da3..6a59fd98 100644 --- a/tests/manual/ApplicationWindow/main.qml +++ b/tests/manual/ApplicationWindow/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.1 diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml index 28e4b06f..ee518c14 100644 --- a/tests/manual/ContextMenu.qml +++ b/tests/manual/ContextMenu.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Rectangle { diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml index 91cdba40..0f964cb2 100644 --- a/tests/manual/Layout.qml +++ b/tests/manual/Layout.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 Item { diff --git a/tests/manual/StackView.qml b/tests/manual/StackView.qml index 5c22072b..b95de4fa 100644 --- a/tests/manual/StackView.qml +++ b/tests/manual/StackView.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Window { width: 480 diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml index 8b05721d..83cd9d25 100644 --- a/tests/manual/WindowContextMenu.qml +++ b/tests/manual/WindowContextMenu.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Window 2.1 Window { diff --git a/tests/manual/baselines/main.qml b/tests/manual/baselines/main.qml index 6edfdd68..4b7a36a3 100644 --- a/tests/manual/baselines/main.qml +++ b/tests/manual/baselines/main.qml @@ -43,7 +43,7 @@ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.1 ApplicationWindow { diff --git a/tests/manual/combobox/main.qml b/tests/manual/combobox/main.qml index 55441c9a..b9f1b36c 100644 --- a/tests/manual/combobox/main.qml +++ b/tests/manual/combobox/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.0 import QtQuick.Dialogs 1.0 diff --git a/tests/manual/popupwindowkeyevents.qml b/tests/manual/popupwindowkeyevents.qml index 8b521c96..8fd8c7f0 100644 --- a/tests/manual/popupwindowkeyevents.qml +++ b/tests/manual/popupwindowkeyevents.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Rectangle { diff --git a/tests/manual/scrollview/main.qml b/tests/manual/scrollview/main.qml index 7c8b8891..61a8e97a 100644 --- a/tests/manual/scrollview/main.qml +++ b/tests/manual/scrollview/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml index aefcbc28..6e1450d0 100644 --- a/tests/manual/splitter.qml +++ b/tests/manual/splitter.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 ApplicationWindow { width: 400 diff --git a/tests/manual/stackview/ButtonMenu.qml b/tests/manual/stackview/ButtonMenu.qml index 684e026a..119aed84 100644 --- a/tests/manual/stackview/ButtonMenu.qml +++ b/tests/manual/stackview/ButtonMenu.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 GridLayout { diff --git a/tests/manual/stackview/View.qml b/tests/manual/stackview/View.qml index f5872a47..58816883 100644 --- a/tests/manual/stackview/View.qml +++ b/tests/manual/stackview/View.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ColumnLayout { diff --git a/tests/manual/stackview/main.qml b/tests/manual/stackview/main.qml index f93bd7fa..ca54005d 100644 --- a/tests/manual/stackview/main.qml +++ b/tests/manual/stackview/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml index c8c5b73a..fef2f6ba 100644 --- a/tests/manual/stretching.qml +++ b/tests/manual/stretching.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Rectangle { diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml index d06e8780..9b65ce73 100644 --- a/tests/manual/stretchingcustom.qml +++ b/tests/manual/stretchingcustom.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Rectangle { diff --git a/tests/manual/tableviewmodels/qml/main.qml b/tests/manual/tableviewmodels/qml/main.qml index 9bc0a0b9..e5b6dda7 100644 --- a/tests/manual/tableviewmodels/qml/main.qml +++ b/tests/manual/tableviewmodels/qml/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Rectangle { width: 360 diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml index 31cb5d77..daadf8d7 100644 --- a/tests/manual/testbench/content/PropertyLayouts.qml +++ b/tests/manual/testbench/content/PropertyLayouts.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 QtObject { diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index 87f7a71b..65e66379 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -263,7 +263,7 @@ ApplicationWindow { case "horizontalAlignment": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.AlignLeft", value: TextEdit.AlignLeft}); enumModelData.append({ text: "TextEdit.AlignRight", value: TextEdit.AlignRight}); @@ -272,7 +272,7 @@ ApplicationWindow { case "textFormat": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText}); enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText}); @@ -281,7 +281,7 @@ ApplicationWindow { case "verticalAlignment": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.AlignTop", value: TextEdit.AlignTop}); enumModelData.append({ text: "TextEdit.AlignBottom", value: TextEdit.AlignBottom}); @@ -290,7 +290,7 @@ ApplicationWindow { case "textFormat": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.RichText", value: TextEdit.RichText}); enumModelData.append({ text: "TextEdit.PlainText", value: TextEdit.PlainText}); @@ -299,7 +299,7 @@ ApplicationWindow { case "inputMethodHints": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.ImhNone", value: Qt.ImhNone}); enumModelData.append({ text: "Qt.ImhHiddenText", value: Qt.ImhHiddenText}); @@ -322,7 +322,7 @@ ApplicationWindow { case "orientation": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.Horizontal", value: Qt.Horizontal}); enumModelData.append({ text: "Qt.Vertical", value: Qt.Vertical}); @@ -330,7 +330,7 @@ ApplicationWindow { case "echoMode": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextInput.Normal", value: TextInput.Normal}); enumModelData.append({ text: "TextInput.Password", value: TextInput.Password}); @@ -342,7 +342,7 @@ ApplicationWindow { case "textColor": isColor = true layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Amber", value: "#FF7E00"}); enumModelData.append({ text: "Azure", value: "#007FFF"}); @@ -351,7 +351,7 @@ ApplicationWindow { case "sortIndicatorOrder": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.AscendingOrder", value: Qt.AscendingOrder}); enumModelData.append({ text: "Qt.DescendingOrder", value: Qt.DescendingOrder}); @@ -359,7 +359,7 @@ ApplicationWindow { case "checkedState": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.1; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.Checked", value: Qt.Checked}); enumModelData.append({ text: "Qt.Unchecked", value: Qt.Unchecked}); |