From 16a6cba54f979bbcac6c91321c5714f829f7d75e Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Wed, 17 Jul 2013 13:24:16 +0200 Subject: [PATCH] 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 --- examples/quick/dialogs/systemdialogs/ColorDialogs.qml | 4 ++-- examples/quick/dialogs/systemdialogs/FileDialogs.qml | 2 +- examples/quick/dialogs/systemdialogs/main.cpp | 2 +- examples/quick/dialogs/systemdialogs/systemdialogs.qml | 2 +- examples/quick/dialogs/systemdialogs/systemdialogs.qrc | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/quick/dialogs/systemdialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml index 6a0af7f..cd74dd6 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 4a21885..c8c5d13 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 2119227..f6723bb 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 b5f9841..6ef1f4b 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 b90b99f..e9a4602 100644 --- a/examples/quick/dialogs/systemdialogs/systemdialogs.qrc +++ b/examples/quick/dialogs/systemdialogs/systemdialogs.qrc @@ -1,5 +1,5 @@ - + systemdialogs.qml FileDialogs.qml ColorDialogs.qml -- 2.7.4