summaryrefslogtreecommitdiff
path: root/examples/quick
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-04-07 10:32:37 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-07 12:12:35 +0200
commita3d87642cdebb32793258b6fe87c590ee5ceb3a5 (patch)
tree7097f4db25db90cfcf51dd7176bfd6b6b343097e /examples/quick
parent783da20117857dbc840b9863f2cb4227773b338c (diff)
downloadqtquickcontrols-a3d87642cdebb32793258b6fe87c590ee5ceb3a5.tar.gz
Import QtQuick 2.2
Change-Id: Ifc9719ec6fbbd80b866c01eebc471d0ed121bd16 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'examples/quick')
-rw-r--r--examples/quick/controls/basiclayouts/main.qml2
-rw-r--r--examples/quick/controls/gallery/content/ChildWindow.qml2
-rw-r--r--examples/quick/controls/gallery/content/Controls.qml2
-rw-r--r--examples/quick/controls/gallery/content/ImageViewer.qml2
-rw-r--r--examples/quick/controls/gallery/content/Layouts.qml2
-rw-r--r--examples/quick/controls/gallery/content/ModelView.qml2
-rw-r--r--examples/quick/controls/gallery/content/Styles.qml2
-rw-r--r--examples/quick/controls/splitview/main.qml2
-rw-r--r--examples/quick/controls/tableview/main.qml2
-rw-r--r--examples/quick/controls/texteditor/qml/ToolBarSeparator.qml2
-rw-r--r--examples/quick/controls/touch/content/AndroidDelegate.qml2
-rw-r--r--examples/quick/controls/touch/content/ButtonPage.qml2
-rw-r--r--examples/quick/controls/touch/content/ListPage.qml2
-rw-r--r--examples/quick/controls/touch/content/ProgressBarPage.qml2
-rw-r--r--examples/quick/controls/touch/content/SliderPage.qml2
-rw-r--r--examples/quick/controls/touch/content/TabBarPage.qml2
-rw-r--r--examples/quick/controls/touch/content/TextInputPage.qml2
-rw-r--r--examples/quick/controls/touch/main.qml2
-rw-r--r--examples/quick/dialogs/systemdialogs/ColorDialogs.qml2
-rw-r--r--examples/quick/dialogs/systemdialogs/CustomDialogs.qml2
-rw-r--r--examples/quick/dialogs/systemdialogs/FileDialogs.qml2
-rw-r--r--examples/quick/dialogs/systemdialogs/MessageDialogs.qml2
22 files changed, 22 insertions, 22 deletions
diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml
index 18883d9a..ecbbb75a 100644
--- a/examples/quick/controls/basiclayouts/main.qml
+++ b/examples/quick/controls/basiclayouts/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/examples/quick/controls/gallery/content/ChildWindow.qml b/examples/quick/controls/gallery/content/ChildWindow.qml
index a645e476..08925f63 100644
--- a/examples/quick/controls/gallery/content/ChildWindow.qml
+++ b/examples/quick/controls/gallery/content/ChildWindow.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Controls 1.1
diff --git a/examples/quick/controls/gallery/content/Controls.qml b/examples/quick/controls/gallery/content/Controls.qml
index 6817d9b7..b7e46188 100644
--- a/examples/quick/controls/gallery/content/Controls.qml
+++ b/examples/quick/controls/gallery/content/Controls.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/gallery/content/ImageViewer.qml b/examples/quick/controls/gallery/content/ImageViewer.qml
index 0b045bf6..01f24ab3 100644
--- a/examples/quick/controls/gallery/content/ImageViewer.qml
+++ b/examples/quick/controls/gallery/content/ImageViewer.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
Window {
diff --git a/examples/quick/controls/gallery/content/Layouts.qml b/examples/quick/controls/gallery/content/Layouts.qml
index db9ae0f0..0cb234c3 100644
--- a/examples/quick/controls/gallery/content/Layouts.qml
+++ b/examples/quick/controls/gallery/content/Layouts.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/examples/quick/controls/gallery/content/ModelView.qml b/examples/quick/controls/gallery/content/ModelView.qml
index 5bbb34f4..be334458 100644
--- a/examples/quick/controls/gallery/content/ModelView.qml
+++ b/examples/quick/controls/gallery/content/ModelView.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
//import QtQuick.XmlListModel 2.1
diff --git a/examples/quick/controls/gallery/content/Styles.qml b/examples/quick/controls/gallery/content/Styles.qml
index 81b46f63..ed237d82 100644
--- a/examples/quick/controls/gallery/content/Styles.qml
+++ b/examples/quick/controls/gallery/content/Styles.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
import QtQuick.Particles 2.0
diff --git a/examples/quick/controls/splitview/main.qml b/examples/quick/controls/splitview/main.qml
index 395188ce..d93c74d3 100644
--- a/examples/quick/controls/splitview/main.qml
+++ b/examples/quick/controls/splitview/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.0
diff --git a/examples/quick/controls/tableview/main.qml b/examples/quick/controls/tableview/main.qml
index d15b6f65..553187b6 100644
--- a/examples/quick/controls/tableview/main.qml
+++ b/examples/quick/controls/tableview/main.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Window 2.1
import QtQuick.Controls 1.1
import QtQuick.XmlListModel 2.0
diff --git a/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml b/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml
index 40a2bc58..b6984976 100644
--- a/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml
+++ b/examples/quick/controls/texteditor/qml/ToolBarSeparator.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
Item {
width: 8
diff --git a/examples/quick/controls/touch/content/AndroidDelegate.qml b/examples/quick/controls/touch/content/AndroidDelegate.qml
index 36a439a8..21ee8e68 100644
--- a/examples/quick/controls/touch/content/AndroidDelegate.qml
+++ b/examples/quick/controls/touch/content/AndroidDelegate.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
Item {
id: root
diff --git a/examples/quick/controls/touch/content/ButtonPage.qml b/examples/quick/controls/touch/content/ButtonPage.qml
index 90a8a69c..4cfb5694 100644
--- a/examples/quick/controls/touch/content/ButtonPage.qml
+++ b/examples/quick/controls/touch/content/ButtonPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/ListPage.qml b/examples/quick/controls/touch/content/ListPage.qml
index 1edd17d0..65dc99f5 100644
--- a/examples/quick/controls/touch/content/ListPage.qml
+++ b/examples/quick/controls/touch/content/ListPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/ProgressBarPage.qml b/examples/quick/controls/touch/content/ProgressBarPage.qml
index 53882897..019d7206 100644
--- a/examples/quick/controls/touch/content/ProgressBarPage.qml
+++ b/examples/quick/controls/touch/content/ProgressBarPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/SliderPage.qml b/examples/quick/controls/touch/content/SliderPage.qml
index 719adf44..91f1504d 100644
--- a/examples/quick/controls/touch/content/SliderPage.qml
+++ b/examples/quick/controls/touch/content/SliderPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/TabBarPage.qml b/examples/quick/controls/touch/content/TabBarPage.qml
index 7070af47..c9bebccd 100644
--- a/examples/quick/controls/touch/content/TabBarPage.qml
+++ b/examples/quick/controls/touch/content/TabBarPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/content/TextInputPage.qml b/examples/quick/controls/touch/content/TextInputPage.qml
index ba9aa1d6..0eeea03a 100644
--- a/examples/quick/controls/touch/content/TextInputPage.qml
+++ b/examples/quick/controls/touch/content/TextInputPage.qml
@@ -42,7 +42,7 @@
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1
diff --git a/examples/quick/controls/touch/main.qml b/examples/quick/controls/touch/main.qml
index 163ec937..c794f7dc 100644
--- a/examples/quick/controls/touch/main.qml
+++ b/examples/quick/controls/touch/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import "content"
diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
index 08c3ffe9..3b0c84c6 100644
--- a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1
diff --git a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml b/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
index 389979ef..81c06b7e 100644
--- a/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/CustomDialogs.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
index ccfff2d6..05e3b5b0 100644
--- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.0
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Window 2.0
diff --git a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml b/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
index 6be99742..619a0b80 100644
--- a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.1
+import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Dialogs 1.1
import QtQuick.Window 2.0
View Lorry Controller Status