diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:10:37 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:10:39 +0200 |
| commit | c3c943545eb7f084da314486524e8c9bb2fab431 (patch) | |
| tree | 6add1fea19fdec25af587e2f38c788c391501b7a /examples | |
| parent | cf62652614676f58f9c45102a67a497c81805a36 (diff) | |
| parent | e443c7ba5552e5c88c331b370cc7a338d8672494 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I2279f181b1c30e81651f8907447ec5c826e11475
Diffstat (limited to 'examples')
6 files changed, 7 insertions, 11 deletions
diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml index 6a0af7f730..cd74dd6766 100644 --- a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml +++ b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml @@ -40,11 +40,11 @@ import QtQuick 2.0 import QtQuick.Dialogs 1.0 -import "../shared" +import "../../shared" Rectangle { width: 320 - height: 200 + height: 240 color: palette.window SystemPalette { id: palette } clip: true diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml index 4a218853ef..c8c5d13885 100644 --- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml +++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml @@ -40,7 +40,7 @@ import QtQuick 2.0 import QtQuick.Dialogs 1.0 -import "../shared" +import "../../shared" Rectangle { width: 580 diff --git a/examples/quick/dialogs/systemdialogs/main.cpp b/examples/quick/dialogs/systemdialogs/main.cpp index 2119227c1f..f6723bb35b 100644 --- a/examples/quick/dialogs/systemdialogs/main.cpp +++ b/examples/quick/dialogs/systemdialogs/main.cpp @@ -38,4 +38,4 @@ ** ****************************************************************************/ #include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(dialogs/systemdialogs) +DECLARATIVE_EXAMPLE_MAIN(dialogs/systemdialogs/systemdialogs) diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.pro b/examples/quick/dialogs/systemdialogs/systemdialogs.pro index e8c3e9857b..4e520d1a5d 100644 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.pro +++ b/examples/quick/dialogs/systemdialogs/systemdialogs.pro @@ -9,9 +9,5 @@ OTHER_FILES += \ FileDialogs.qml \ ColorDialogs.qml -EXAMPLE_FILES = \ - FileDialogs.qml \ - ColorDialogs.qml - -target.path = $$[QT_INSTALL_EXAMPLES]/quick/dialogs +target.path = $$[QT_INSTALL_EXAMPLES]/quick/dialogs/systemdialogs INSTALLS += target diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qml b/examples/quick/dialogs/systemdialogs/systemdialogs.qml index b5f9841a3f..6ef1f4b507 100644 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.qml +++ b/examples/quick/dialogs/systemdialogs/systemdialogs.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../shared" +import "../../shared" TabSet { width: 580 diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.qrc b/examples/quick/dialogs/systemdialogs/systemdialogs.qrc index b90b99f7f5..e9a46022b2 100644 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.qrc +++ b/examples/quick/dialogs/systemdialogs/systemdialogs.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/dialogs"> + <qresource prefix="/dialogs/systemdialogs"> <file>systemdialogs.qml</file> <file>FileDialogs.qml</file> <file>ColorDialogs.qml</file> |