Install common resources.

Install common components and resources from the aux projects.

Change-Id: Ie0a8e2ae6320144ca8dd15da89c9b39b7fc8dc76
Reviewed-by: Natalia Shubina <natalia.shubina@nokia.com>

4 files changed, 28 insertions, 24 deletions

diff --git a/examples/declarative/common/common.pri b/examples/declarative/common/common.pri
index 3e460256..1b721bbd 100644
--- a/examples/declarative/common/common.pri
+++ b/examples/declarative/common/common.pri
@@ -4,6 +4,8 @@ QML_IMPORT_PATH += $$PWD
 RESOURCES += \
     $$PWD/common.qrc
 
+commonresources.files += $$PWD/resources/*
+
 qmlcomponents.files += \
     $$PWD/QtLocation/examples/components/TextWithLabel.qml \
     $$PWD/QtLocation/examples/components/Button.qml \
@@ -29,3 +31,5 @@ qmldialogs.files += \
     $$PWD/QtLocation/examples/dialogs/Dialog.qml
 OTHER_FILES += $$qmldialogs.files
 
+qmldir.files += $$PWD/QtLocation/examples/qmldir
+OTHER_FILES += $$qmldir.files
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
diff --git a/examples/declarative/places/qml.pro b/examples/declarative/places/qml.pro
index a2a3ddf9..09f55458 100644
--- a/examples/declarative/places/qml.pro
+++ b/examples/declarative/places/qml.pro
@@ -6,21 +6,19 @@ files.path = /opt/mt/applications/mt-qt5location-places
 include(places.pri)
 
 qmlcontent.path = $$files.path
-qmlcontentdialogs.path = $$files.path/content/dialogs
-qmlcontentmap.path = $$files.path/content/map
 qmlcontentplaces.path = $$files.path/content/places
-qmlcontentcomponents.path = $$files.path/content/components
-qmlcontentcomponentsstyle.path = $$files.path/content/components/style
-
-resources.files = content/resources/*
-resources.path = $$files.path/content/resources
+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 \
     qmlcontentplaces \
-    qmlcontentcomponents \
-    qmlcontentcomponentsstyle \
-    resources
+    qmlcomponents \
+    qmlcomponentsstyle \
+    qmldialogs \
+    qmldir \
+    commonresources