Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/controls/ApplicationWindow.qml

Change-Id: I2ab8efb4e04006724410da0f6ed03bd2672c5eb6

26 files changed, 46 insertions, 46 deletions

diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml
index 18883d9a..7e95b80b 100644
--- a/examples/quick/controls/basiclayouts/main.qml
+++ b/examples/quick/controls/basiclayouts/main.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Layouts 1.0
 
 ApplicationWindow {
diff --git a/examples/quick/controls/gallery/content/ChildWindow.qml b/examples/quick/controls/gallery/content/ChildWindow.qml
index a645e476..039e20dd 100644
--- a/examples/quick/controls/gallery/content/ChildWindow.qml
+++ b/examples/quick/controls/gallery/content/ChildWindow.qml
@@ -42,9 +42,9 @@
 
 
 
-import QtQuick 2.1
+import QtQuick 2.2
 import QtQuick.Window 2.1
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.2
 
 Window {
     id: window1
diff --git a/examples/quick/controls/gallery/content/Controls.qml b/examples/quick/controls/gallery/content/Controls.qml
index 6817d9b7..64df4ebd 100644
--- a/examples/quick/controls/gallery/content/Controls.qml
+++ b/examples/quick/controls/gallery/content/Controls.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 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..8d6b096e 100644
--- a/examples/quick/controls/gallery/content/Layouts.qml
+++ b/examples/quick/controls/gallery/content/Layouts.qml
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Layouts 1.0
 
 Item {
diff --git a/examples/quick/controls/gallery/content/ModelView.qml b/examples/quick/controls/gallery/content/ModelView.qml
index 5bbb34f4..5474f1ba 100644
--- a/examples/quick/controls/gallery/content/ModelView.qml
+++ b/examples/quick/controls/gallery/content/ModelView.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 //import QtQuick.XmlListModel 2.1
 
 Item {
diff --git a/examples/quick/controls/gallery/content/Styles.qml b/examples/quick/controls/gallery/content/Styles.qml
index 81b46f63..f78ab69f 100644
--- a/examples/quick/controls/gallery/content/Styles.qml
+++ b/examples/quick/controls/gallery/content/Styles.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.1
 import QtQuick.Particles 2.0
 import QtQuick.Layouts 1.0
diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml
index 7250bb31..0ca8c7cf 100644
--- a/examples/quick/controls/gallery/main.qml
+++ b/examples/quick/controls/gallery/main.qml
@@ -43,7 +43,7 @@
 
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.2
 import QtQuick.Layouts 1.0
 import QtQuick.Dialogs 1.0
 import "content"
diff --git a/examples/quick/controls/splitview/main.qml b/examples/quick/controls/splitview/main.qml
index 395188ce..8707b6cc 100644
--- a/examples/quick/controls/splitview/main.qml
+++ b/examples/quick/controls/splitview/main.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Layouts 1.0
 
 ApplicationWindow {
diff --git a/examples/quick/controls/tableview/main.qml b/examples/quick/controls/tableview/main.qml
index d15b6f65..e90e1104 100644
--- a/examples/quick/controls/tableview/main.qml
+++ b/examples/quick/controls/tableview/main.qml
@@ -42,9 +42,9 @@
 
 
 
-import QtQuick 2.1
+import QtQuick 2.2
 import QtQuick.Window 2.1
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.2
 import QtQuick.XmlListModel 2.0
 
 Window {
@@ -286,9 +286,9 @@ Window {
                                     target: loaderEditor.item
                                     onAccepted: {
                                         if (typeof styleData.value === 'number')
-                                            model.setProperty(styleData.row, styleData.role, Number(parseFloat(loaderEditor.item.text).toFixed(0)))
+                                            largeModel.setProperty(styleData.row, styleData.role, Number(parseFloat(loaderEditor.item.text).toFixed(0)))
                                         else
-                                            model.setProperty(styleData.row, styleData.role, loaderEditor.item.text)
+                                            largeModel.setProperty(styleData.row, styleData.role, loaderEditor.item.text)
                                     }
                                 }
                                 sourceComponent: styleData.selected ? editor : null
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/texteditor/qml/main.qml b/examples/quick/controls/texteditor/qml/main.qml
index 89120094..1a66afa5 100644
--- a/examples/quick/controls/texteditor/qml/main.qml
+++ b/examples/quick/controls/texteditor/qml/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
 import QtQuick.Dialogs 1.1
 import QtQuick.Window 2.1
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..f7f541bc 100644
--- a/examples/quick/controls/touch/content/ButtonPage.qml
+++ b/examples/quick/controls/touch/content/ButtonPage.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.1
 
 Item {
diff --git a/examples/quick/controls/touch/content/ListPage.qml b/examples/quick/controls/touch/content/ListPage.qml
index 1edd17d0..4e2dbeb8 100644
--- a/examples/quick/controls/touch/content/ListPage.qml
+++ b/examples/quick/controls/touch/content/ListPage.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.1
 
 ScrollView {
diff --git a/examples/quick/controls/touch/content/ProgressBarPage.qml b/examples/quick/controls/touch/content/ProgressBarPage.qml
index 53882897..efcec5ee 100644
--- a/examples/quick/controls/touch/content/ProgressBarPage.qml
+++ b/examples/quick/controls/touch/content/ProgressBarPage.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.1
 
 Item {
diff --git a/examples/quick/controls/touch/content/SliderPage.qml b/examples/quick/controls/touch/content/SliderPage.qml
index 719adf44..f6931800 100644
--- a/examples/quick/controls/touch/content/SliderPage.qml
+++ b/examples/quick/controls/touch/content/SliderPage.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.1
 
 Item {
diff --git a/examples/quick/controls/touch/content/TabBarPage.qml b/examples/quick/controls/touch/content/TabBarPage.qml
index 7070af47..3ffd45ba 100644
--- a/examples/quick/controls/touch/content/TabBarPage.qml
+++ b/examples/quick/controls/touch/content/TabBarPage.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.1
 
 Item {
diff --git a/examples/quick/controls/touch/content/TextInputPage.qml b/examples/quick/controls/touch/content/TextInputPage.qml
index ba9aa1d6..c0e60d62 100644
--- a/examples/quick/controls/touch/content/TextInputPage.qml
+++ b/examples/quick/controls/touch/content/TextInputPage.qml
@@ -42,8 +42,8 @@
 
 
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.1
 
 Item {
diff --git a/examples/quick/controls/touch/main.qml b/examples/quick/controls/touch/main.qml
index 163ec937..4efea3cb 100644
--- a/examples/quick/controls/touch/main.qml
+++ b/examples/quick/controls/touch/main.qml
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import "content"
 
 ApplicationWindow {
diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
index 08c3ffe9..c44284df 100644
--- a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Dialogs 1.1
 
 Item {
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..6bdaf7bc 100644
--- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Dialogs 1.1
 import QtQuick.Window 2.0
 
diff --git a/examples/quick/dialogs/systemdialogs/FontDialogs.qml b/examples/quick/dialogs/systemdialogs/FontDialogs.qml
index da96d09d..dc8f245b 100644
--- a/examples/quick/dialogs/systemdialogs/FontDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/FontDialogs.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.2
 import QtQuick.Dialogs 1.1
 
 Rectangle {
diff --git a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml b/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
index 6be99742..1bc9a4b6 100644
--- a/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/MessageDialogs.qml
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
-import QtQuick.Controls 1.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Dialogs 1.1
 import QtQuick.Window 2.0
 
diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qml b/examples/quick/dialogs/systemdialogs/systemdialogs.qml
index f3372ea0..0c30d9e5 100644
--- a/examples/quick/dialogs/systemdialogs/systemdialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/systemdialogs.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-import QtQuick.Controls 1.1
+import QtQuick.Controls 1.2
 
 ApplicationWindow {
     visible: true