diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:19:56 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:19:56 +0200 |
commit | 955c8d6deaa04f4541c935c39a9273e7f6e47546 (patch) | |
tree | 5ffa321729df792c8817656994f5418d92f8cc48 /examples/quick/controls/gallery | |
parent | 6500876779574a317ffe289958746bbd348074b9 (diff) | |
parent | 53fca456b2d5c4d290592846c0a14242ac218e1d (diff) | |
download | qtquickcontrols-955c8d6deaa04f4541c935c39a9273e7f6e47546.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/controls/ApplicationWindow.qml
Change-Id: I2ab8efb4e04006724410da0f6ed03bd2672c5eb6
Diffstat (limited to 'examples/quick/controls/gallery')
7 files changed, 12 insertions, 12 deletions
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" |