summaryrefslogtreecommitdiffstats
path: root/examples/quick/controls
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-04-11 14:19:56 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-04-11 14:19:56 +0200
commit955c8d6deaa04f4541c935c39a9273e7f6e47546 (patch)
tree5ffa321729df792c8817656994f5418d92f8cc48 /examples/quick/controls
parent6500876779574a317ffe289958746bbd348074b9 (diff)
parent53fca456b2d5c4d290592846c0a14242ac218e1d (diff)
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: src/controls/ApplicationWindow.qml Change-Id: I2ab8efb4e04006724410da0f6ed03bd2672c5eb6
Diffstat (limited to 'examples/quick/controls')
-rw-r--r--examples/quick/controls/basiclayouts/main.qml4
-rw-r--r--examples/quick/controls/gallery/content/ChildWindow.qml4
-rw-r--r--examples/quick/controls/gallery/content/Controls.qml4
-rw-r--r--examples/quick/controls/gallery/content/ImageViewer.qml2
-rw-r--r--examples/quick/controls/gallery/content/Layouts.qml4
-rw-r--r--examples/quick/controls/gallery/content/ModelView.qml4
-rw-r--r--examples/quick/controls/gallery/content/Styles.qml4
-rw-r--r--examples/quick/controls/gallery/main.qml2
-rw-r--r--examples/quick/controls/splitview/main.qml4
-rw-r--r--examples/quick/controls/tableview/main.qml8
-rw-r--r--examples/quick/controls/texteditor/qml/ToolBarSeparator.qml2
-rw-r--r--examples/quick/controls/texteditor/qml/main.qml2
-rw-r--r--examples/quick/controls/touch/content/AndroidDelegate.qml2
-rw-r--r--examples/quick/controls/touch/content/ButtonPage.qml4
-rw-r--r--examples/quick/controls/touch/content/ListPage.qml4
-rw-r--r--examples/quick/controls/touch/content/ProgressBarPage.qml4
-rw-r--r--examples/quick/controls/touch/content/SliderPage.qml4
-rw-r--r--examples/quick/controls/touch/content/TabBarPage.qml4
-rw-r--r--examples/quick/controls/touch/content/TextInputPage.qml4
-rw-r--r--examples/quick/controls/touch/main.qml4
20 files changed, 37 insertions, 37 deletions
diff --git a/examples/quick/controls/basiclayouts/main.qml b/examples/quick/controls/basiclayouts/main.qml
index 18883d9a9..7e95b80b1 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 a645e4766..039e20dd8 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 6817d9b72..64df4ebdb 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 0b045bf6a..01f24ab33 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 db9ae0f08..8d6b096e6 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 5bbb34f4f..5474f1ba7 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 81b46f636..f78ab69f9 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 7250bb313..0ca8c7cf8 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 395188ce7..8707b6cc8 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 d15b6f65b..e90e11043 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 40a2bc580..b69849762 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 89120094d..1a66afa58 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 36a439a8e..21ee8e680 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 90a8a69c5..f7f541bc5 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 1edd17d05..4e2dbeb84 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 53882897f..efcec5ee9 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 719adf440..f69318001 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 7070af47f..3ffd45baa 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 ba9aa1d6f..c0e60d62e 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 163ec9372..4efea3cbb 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 {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-18 04:15:28 +0000