summaryrefslogtreecommitdiff
path: root/examples/declarative/mapviewer
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2011-12-15 13:07:22 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-16 06:47:44 +0100
commit4f770dc2728f04faeb1e8204057f79ad4fd24e73 (patch)
treed4e28a9ef2dac1ffd6c6c1830840e0f577576244 /examples/declarative/mapviewer
parent9acb633d4faabcc813d5e0488808041a1cd36a6e (diff)
downloadqtlocation-4f770dc2728f04faeb1e8204057f79ad4fd24e73.tar.gz
Install common resources.
Install common components and resources from the aux projects. Change-Id: Ie0a8e2ae6320144ca8dd15da89c9b39b7fc8dc76 Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>
Diffstat (limited to 'examples/declarative/mapviewer')
-rw-r--r--examples/declarative/mapviewer/content/dialogs/RouteDialog.qml4
-rw-r--r--examples/declarative/mapviewer/qml.pro22
2 files changed, 14 insertions, 12 deletions
diff --git a/examples/declarative/mapviewer/content/dialogs/RouteDialog.qml b/examples/declarative/mapviewer/content/dialogs/RouteDialog.qml
index 81b346a8..5bec45cd 100644
--- a/examples/declarative/mapviewer/content/dialogs/RouteDialog.qml
+++ b/examples/declarative/mapviewer/content/dialogs/RouteDialog.qml
@@ -123,7 +123,7 @@ Item {
Image {
id: optionButtonCoord
anchors.verticalCenter:parent.verticalCenter
- source: coord.enabled ? "../../../resources/option_button_selected.png" : "../../../resources/option_button.png"
+ source: coord.enabled ? "../../resources/option_button_selected.png" : "../../resources/option_button.png"
MouseArea {
anchors.fill: parent
onClicked: { options.state = "" }
@@ -236,7 +236,7 @@ Item {
Image {
id: optionButtonAddress
- source: address.enabled ? "../../../resources/option_button_selected.png" : "../../../resources/option_button.png"
+ source: address.enabled ? "../../resources/option_button_selected.png" : "../../resources/option_button.png"
anchors.verticalCenter: parent.verticalCenter
MouseArea {
anchors.fill: parent
diff --git a/examples/declarative/mapviewer/qml.pro b/examples/declarative/mapviewer/qml.pro
index 049d239d..de31af0b 100644
--- a/examples/declarative/mapviewer/qml.pro
+++ b/examples/declarative/mapviewer/qml.pro
@@ -6,19 +6,21 @@ files.path = /opt/mt/applications/mt-qt5location-mapviewer
include(mapviewer.pri)
qmlcontent.path = $$files.path
-qmlcontentdialogs.path = $$files.path/content/dialogs
qmlcontentmap.path = $$files.path/content/map
-qmlcontentcomponents.path = $$files.path/content/components
-qmlcontentcomponentsstyle.path = $$files.path/content/components/style
-
-resources.files = content/resources/*
-resources.path = $$files.path/content/resources
+qmlcontentdialogs.path = $$files.path/content/dialogs
+qmlcomponents.path = $$files.path/imports/QtLocation/examples/components
+qmlcomponentsstyle.path = $$qmlcomponents.path/style
+qmldialogs.path = $$files.path/imports/QtLocation/examples/dialogs
+qmldir.path = $$files.path/imports/QtLocation/examples
+commonresources.path = $$files.path/resources
INSTALLS += \
files \
qmlcontent \
- qmlcontentdialogs \
qmlcontentmap \
- qmlcontentcomponents \
- qmlcontentcomponentsstyle \
- resources
+ qmlcontentdialogs \
+ qmlcomponents \
+ qmlcomponentsstyle \
+ qmldialogs \
+ qmldir \
+ commonresources