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/dialogs/systemdialogs | |
| parent | 6500876779574a317ffe289958746bbd348074b9 (diff) | |
| parent | 53fca456b2d5c4d290592846c0a14242ac218e1d (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/controls/ApplicationWindow.qml
Change-Id: I2ab8efb4e04006724410da0f6ed03bd2672c5eb6
Diffstat (limited to 'examples/quick/dialogs/systemdialogs')
6 files changed, 9 insertions, 9 deletions
diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml index 08c3ffe97..c44284df1 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 389979ef5..81c06b7e6 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 ccfff2d6b..6bdaf7bc6 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 da96d09d6..dc8f245bc 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 6be997420..1bc9a4b66 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 f3372ea0f..0c30d9e59 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 |