diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-07-17 13:24:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-17 13:46:37 +0200 |
| commit | 16a6cba54f979bbcac6c91321c5714f829f7d75e (patch) | |
| tree | 66bd1359ba2e88aebd85f55de5f6279e6249667a /examples | |
| parent | 3a67542e06d15386af10056caface835ed8b8e48 (diff) | |
systemdialogs example: ensure that all QML files work with qmlscene
Sync up relative paths in the qrc and the actual directories so that
you can run qmlscene with any of the QML files in this directory
and it will still find the shared resources.
Change-Id: I0f216df6b370c19948312fa00a33ce77ccabcd78
Reviewed-by: Liang Qi <liang.qi@digia.com>
Diffstat (limited to 'examples')
5 files changed, 6 insertions, 6 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.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> |