Modified landmarkmap, location flickr, and mapviewer deployment rules to

work on linux as well.

57 files changed, 30 insertions, 18 deletions

diff --git a/examples/declarative-location/flickr/deployment.pri b/examples/declarative-location/flickr/deployment.pri
index 2a71938b50..78939d4fb9 100644
--- a/examples/declarative-location/flickr/deployment.pri
+++ b/examples/declarative-location/flickr/deployment.pri
@@ -4,5 +4,9 @@ qmlflickr_src = $$PWD
 symbian {
     load(data_caging_paths)
 }
-qmlflickr_files.sources = $$qmlflickr_src/flickr.qml $$qmlflickr_src/common $$qmlflickr_src/mobile
-DEPLOYMENT += qmlflickr_files
+deployment_files.sources = $$qmlflickr_src/flickr.qml $$qmlflickr_src/flickrcommon $$qmlflickr_src/flickrmobile
+DEPLOYMENT += deployment_files
+install_files.files = $$qmlflickr_src/flickr.qml $$qmlflickr_src/flickrcommon $$qmlflickr_src/flickrmobile
+install_files.path = $$QT_MOBILITY_EXAMPLES
+INSTALLS += install_files
+
diff --git a/examples/declarative-location/flickr/flickr.pro b/examples/declarative-location/flickr/flickr.pro
index ed20fc0ef2..24c67dac52 100644
--- a/examples/declarative-location/flickr/flickr.pro
+++ b/examples/declarative-location/flickr/flickr.pro
@@ -1,5 +1,5 @@
-include($$PWD/deployment.pri)
 include($$PWD/../declarative-location.pri)
+include($$PWD/deployment.pri)
 
 QT += declarative network
 SOURCES += $$PWD/qmllocationflickr.cpp
diff --git a/examples/declarative-location/flickr/flickr.qml b/examples/declarative-location/flickr/flickr.qml
index 32d770b034..75f054cab6 100755
--- a/examples/declarative-location/flickr/flickr.qml
+++ b/examples/declarative-location/flickr/flickr.qml
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 import Qt 4.7
-import "common" as Common
-import "mobile" as Mobile
+import "flickrcommon" as Common
+import "flickrmobile" as Mobile
 
 Item {
     id: screen; width: 320; height: 480
@@ -51,7 +51,7 @@ Item {
         id: background
         anchors.fill: parent; color: "#343434";
 
-        Image { source: "mobile/images/stripes.png"; fillMode: Image.Tile; anchors.fill: parent; opacity: 0.3 }
+        Image { source: "flickrmobile/images/stripes.png"; fillMode: Image.Tile; anchors.fill: parent; opacity: 0.3 }
 
         Common.RestModel {
             id: restModel;
diff --git a/examples/declarative-location/flickr/common/Progress.qml b/examples/declarative-location/flickr/flickrcommon/Progress.qml
index 99e1a7b6a8..99e1a7b6a8 100755
--- a/examples/declarative-location/flickr/common/Progress.qml
+++ b/examples/declarative-location/flickr/flickrcommon/Progress.qml
diff --git a/examples/declarative-location/flickr/common/RestModel.qml b/examples/declarative-location/flickr/flickrcommon/RestModel.qml
index a728a451d1..a728a451d1 100755
--- a/examples/declarative-location/flickr/common/RestModel.qml
+++ b/examples/declarative-location/flickr/flickrcommon/RestModel.qml
diff --git a/examples/declarative-location/flickr/common/ScrollBar.qml b/examples/declarative-location/flickr/flickrcommon/ScrollBar.qml
index 1574915b44..1574915b44 100755
--- a/examples/declarative-location/flickr/common/ScrollBar.qml
+++ b/examples/declarative-location/flickr/flickrcommon/ScrollBar.qml
diff --git a/examples/declarative-location/flickr/common/Slider.qml b/examples/declarative-location/flickr/flickrcommon/Slider.qml
index 4353f8d0c6..4353f8d0c6 100755
--- a/examples/declarative-location/flickr/common/Slider.qml
+++ b/examples/declarative-location/flickr/flickrcommon/Slider.qml
diff --git a/examples/declarative-location/flickr/common/qmldir b/examples/declarative-location/flickr/flickrcommon/qmldir
index 0b7e990154..0b7e990154 100755
--- a/examples/declarative-location/flickr/common/qmldir
+++ b/examples/declarative-location/flickr/flickrcommon/qmldir
diff --git a/examples/declarative-location/flickr/mobile/Button.qml b/examples/declarative-location/flickr/flickrmobile/Button.qml
index 93a6661216..93a6661216 100755
--- a/examples/declarative-location/flickr/mobile/Button.qml
+++ b/examples/declarative-location/flickr/flickrmobile/Button.qml
diff --git a/examples/declarative-location/flickr/mobile/GeoTab.qml b/examples/declarative-location/flickr/flickrmobile/GeoTab.qml
index 48a0111e48..48a0111e48 100644
--- a/examples/declarative-location/flickr/mobile/GeoTab.qml
+++ b/examples/declarative-location/flickr/flickrmobile/GeoTab.qml
diff --git a/examples/declarative-location/flickr/mobile/GridDelegate.qml b/examples/declarative-location/flickr/flickrmobile/GridDelegate.qml
index 1ad42aebd4..1ad42aebd4 100755
--- a/examples/declarative-location/flickr/mobile/GridDelegate.qml
+++ b/examples/declarative-location/flickr/flickrmobile/GridDelegate.qml
diff --git a/examples/declarative-location/flickr/mobile/ImageDetails.qml b/examples/declarative-location/flickr/flickrmobile/ImageDetails.qml
index f3c9af8ae9..ccb4459955 100755
--- a/examples/declarative-location/flickr/mobile/ImageDetails.qml
+++ b/examples/declarative-location/flickr/flickrmobile/ImageDetails.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import Qt 4.7
-import "../common" as Common
+import "../flickrcommon" as Common
 
 Flipable {
     id: container
diff --git a/examples/declarative-location/flickr/mobile/ListDelegate.qml b/examples/declarative-location/flickr/flickrmobile/ListDelegate.qml
index 7a421f8b7e..7a421f8b7e 100755
--- a/examples/declarative-location/flickr/mobile/ListDelegate.qml
+++ b/examples/declarative-location/flickr/flickrmobile/ListDelegate.qml
diff --git a/examples/declarative-location/flickr/mobile/Test.qml b/examples/declarative-location/flickr/flickrmobile/Test.qml
index 8b13789179..8b13789179 100644
--- a/examples/declarative-location/flickr/mobile/Test.qml
+++ b/examples/declarative-location/flickr/flickrmobile/Test.qml
diff --git a/examples/declarative-location/flickr/mobile/TitleBar.qml b/examples/declarative-location/flickr/flickrmobile/TitleBar.qml
index c9213d3466..c9213d3466 100755
--- a/examples/declarative-location/flickr/mobile/TitleBar.qml
+++ b/examples/declarative-location/flickr/flickrmobile/TitleBar.qml
diff --git a/examples/declarative-location/flickr/mobile/ToolBar.qml b/examples/declarative-location/flickr/flickrmobile/ToolBar.qml
index b9cb915232..b9cb915232 100755
--- a/examples/declarative-location/flickr/mobile/ToolBar.qml
+++ b/examples/declarative-location/flickr/flickrmobile/ToolBar.qml
diff --git a/examples/declarative-location/flickr/mobile/images/gloss.png b/examples/declarative-location/flickr/flickrmobile/images/gloss.png
index 5d370cd93d..5d370cd93d 100755
--- a/examples/declarative-location/flickr/mobile/images/gloss.png
+++ b/examples/declarative-location/flickr/flickrmobile/images/gloss.png
diff --git a/examples/declarative-location/flickr/mobile/images/lineedit.png b/examples/declarative-location/flickr/flickrmobile/images/lineedit.png
index 2cc38dc35b..2cc38dc35b 100755
--- a/examples/declarative-location/flickr/mobile/images/lineedit.png
+++ b/examples/declarative-location/flickr/flickrmobile/images/lineedit.png
diff --git a/examples/declarative-location/flickr/mobile/images/lineedit.sci b/examples/declarative-location/flickr/flickrmobile/images/lineedit.sci
index 054bff78be..054bff78be 100755
--- a/examples/declarative-location/flickr/mobile/images/lineedit.sci
+++ b/examples/declarative-location/flickr/flickrmobile/images/lineedit.sci
diff --git a/examples/declarative-location/flickr/mobile/images/moon.png b/examples/declarative-location/flickr/flickrmobile/images/moon.png
index 9407b2b4f0..9407b2b4f0 100755
--- a/examples/declarative-location/flickr/mobile/images/moon.png
+++ b/examples/declarative-location/flickr/flickrmobile/images/moon.png
diff --git a/examples/declarative-location/flickr/mobile/images/quit.png b/examples/declarative-location/flickr/flickrmobile/images/quit.png
index 5bda1b6e0d..5bda1b6e0d 100755
--- a/examples/declarative-location/flickr/mobile/images/quit.png
+++ b/examples/declarative-location/flickr/flickrmobile/images/quit.png
diff --git a/examples/declarative-location/flickr/mobile/images/star.png b/examples/declarative-location/flickr/flickrmobile/images/star.png
index 27ef924267..27ef924267 100755
--- a/examples/declarative-location/flickr/mobile/images/star.png
+++ b/examples/declarative-location/flickr/flickrmobile/images/star.png
diff --git a/examples/declarative-location/flickr/mobile/images/stripes.png b/examples/declarative-location/flickr/flickrmobile/images/stripes.png
index 9f36727ea4..9f36727ea4 100755
--- a/examples/declarative-location/flickr/mobile/images/stripes.png
+++ b/examples/declarative-location/flickr/flickrmobile/images/stripes.png
diff --git a/examples/declarative-location/flickr/mobile/images/sun.png b/examples/declarative-location/flickr/flickrmobile/images/sun.png
index 7713ca5ce7..7713ca5ce7 100755
--- a/examples/declarative-location/flickr/mobile/images/sun.png
+++ b/examples/declarative-location/flickr/flickrmobile/images/sun.png
diff --git a/examples/declarative-location/flickr/mobile/images/titlebar.png b/examples/declarative-location/flickr/flickrmobile/images/titlebar.png
index 51c90082d0..51c90082d0 100755
--- a/examples/declarative-location/flickr/mobile/images/titlebar.png
+++ b/examples/declarative-location/flickr/flickrmobile/images/titlebar.png
diff --git a/examples/declarative-location/flickr/mobile/images/titlebar.sci b/examples/declarative-location/flickr/flickrmobile/images/titlebar.sci
index 0418d94cd6..0418d94cd6 100755
--- a/examples/declarative-location/flickr/mobile/images/titlebar.sci
+++ b/examples/declarative-location/flickr/flickrmobile/images/titlebar.sci
diff --git a/examples/declarative-location/flickr/mobile/images/toolbutton.png b/examples/declarative-location/flickr/flickrmobile/images/toolbutton.png
index 11310013ee..11310013ee 100755
--- a/examples/declarative-location/flickr/mobile/images/toolbutton.png
+++ b/examples/declarative-location/flickr/flickrmobile/images/toolbutton.png
diff --git a/examples/declarative-location/flickr/mobile/images/toolbutton.sci b/examples/declarative-location/flickr/flickrmobile/images/toolbutton.sci
index 9e4f965307..9e4f965307 100755
--- a/examples/declarative-location/flickr/mobile/images/toolbutton.sci
+++ b/examples/declarative-location/flickr/flickrmobile/images/toolbutton.sci
diff --git a/examples/declarative-location/flickr/mobile/nmealog.txt b/examples/declarative-location/flickr/flickrmobile/nmealog.txt
index 8c8286ddc5..8c8286ddc5 100755
--- a/examples/declarative-location/flickr/mobile/nmealog.txt
+++ b/examples/declarative-location/flickr/flickrmobile/nmealog.txt
diff --git a/examples/declarative-location/landmarkmap/deployment.pri b/examples/declarative-location/landmarkmap/deployment.pri
index 56a841d67a..5547e34687 100644
--- a/examples/declarative-location/landmarkmap/deployment.pri
+++ b/examples/declarative-location/landmarkmap/deployment.pri
@@ -4,5 +4,9 @@ my_src_dir = $$PWD
 symbian {
     load(data_caging_paths)
 }
-my_files.sources = $$my_src_dir/landmarkmap.qml $$my_src_dir/common $$my_src_dir/mobile
+my_files.sources = $$my_src_dir/landmarkmap.qml $$my_src_dir/landmarkmapcommon $$my_src_dir/landmarkmapmobile nmealog.txt
 DEPLOYMENT += my_files
+
+install_files.files += $$my_src_dir/landmarkmap.qml $$my_src_dir/landmarkmapcommon $$my_src_dir/landmarkmapmobile nmealog.txt
+install_files.path = $$QT_MOBILITY_EXAMPLES
+INSTALLS += install_files
\ No newline at end of file
diff --git a/examples/declarative-location/landmarkmap/landmarkmap.pro b/examples/declarative-location/landmarkmap/landmarkmap.pro
index d9583dadfd..3c1a5cb8dd 100644
--- a/examples/declarative-location/landmarkmap/landmarkmap.pro
+++ b/examples/declarative-location/landmarkmap/landmarkmap.pro
@@ -1,7 +1,7 @@
 QT += declarative network
 SOURCES += $$PWD/qmllandmarkmap.cpp
-include($$PWD/deployment.pri)
 include($$PWD/../declarative-location.pri)
+include($$PWD/deployment.pri)
 
 TARGET = qml_landmarkmap
 
diff --git a/examples/declarative-location/landmarkmap/landmarkmap.qml b/examples/declarative-location/landmarkmap/landmarkmap.qml
index b2a3e51cce..c5428beff4 100644
--- a/examples/declarative-location/landmarkmap/landmarkmap.qml
+++ b/examples/declarative-location/landmarkmap/landmarkmap.qml
@@ -41,8 +41,8 @@
 
 import Qt 4.7
 import QtMobility.location 1.1
-import "common" as Common
-import "mobile" as Mobile
+import "landmarkmapcommon" as Common
+import "landmarkmapmobile" as Mobile
 
 Item {
     id: page
@@ -97,7 +97,7 @@ Item {
             y: map.toScreenPosition(landmark.coordinate).y
             Image {
                 id: landmarkIcon
-                source: "mobile/images/landmarkstar.png"
+                source: "landmarkmapmobile/images/landmarkstar.png"
                 MouseArea{
                     anchors.fill: parent
                     onClicked: {
@@ -144,7 +144,7 @@ Item {
         width: parent.width
         color: "#343434"
         //height: toolbar1.y - titleBar.height
-        Image { source: "mobile/images/stripes.png"; fillMode: Image.Tile; anchors.fill: parent; opacity: 0.3 }
+        Image { source: "landmarkmapmobile/images/stripes.png"; fillMode: Image.Tile; anchors.fill: parent; opacity: 0.3 }
         MouseArea {
             anchors.fill: parent
             onDoubleClicked: map.center = map.toCoordinate(Qt.point(mouse.x, mouse.y))
@@ -264,7 +264,7 @@ Item {
         height: 40; width: parent.width
         anchors.bottom: parent.bottom
         z: 6
-        button1Label: "nmealog.txt"; button2Label: "mydb.gpx"; button3Label: "show me"
+        button1Label: "nmealog.txt"; button2Label: "mylm.lmx"; button3Label: "show me"
         button3FontColor: "pink"
         onButton1Clicked: {
             console.log("Clicked, setting nmea log as source");
@@ -273,7 +273,7 @@ Item {
         }
         onButton2Clicked: {
             console.log("Clicked, setting import file to get landmarks, count was: " + landmarkModel.count);
-            landmarkModel.importFile = "mydb.gpx"
+            landmarkModel.importFile = "mylm.lmx"
         }
         onButton3Clicked: {
             console.log("Clicked, setting map center to current location");
diff --git a/examples/declarative-location/landmarkmap/common/ScrollBar.qml b/examples/declarative-location/landmarkmap/landmarkmapcommon/ScrollBar.qml
index 1574915b44..1574915b44 100755
--- a/examples/declarative-location/landmarkmap/common/ScrollBar.qml
+++ b/examples/declarative-location/landmarkmap/landmarkmapcommon/ScrollBar.qml
diff --git a/examples/declarative-location/landmarkmap/common/Slider.qml b/examples/declarative-location/landmarkmap/landmarkmapcommon/Slider.qml
index 009b0d3a21..009b0d3a21 100755
--- a/examples/declarative-location/landmarkmap/common/Slider.qml
+++ b/examples/declarative-location/landmarkmap/landmarkmapcommon/Slider.qml
diff --git a/examples/declarative-location/landmarkmap/common/qmldir b/examples/declarative-location/landmarkmap/landmarkmapcommon/qmldir
index 8c50b9a3ba..8c50b9a3ba 100755
--- a/examples/declarative-location/landmarkmap/common/qmldir
+++ b/examples/declarative-location/landmarkmap/landmarkmapcommon/qmldir
diff --git a/examples/declarative-location/landmarkmap/mobile/Button.qml b/examples/declarative-location/landmarkmap/landmarkmapmobile/Button.qml
index 2a68514904..2a68514904 100755
--- a/examples/declarative-location/landmarkmap/mobile/Button.qml
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/Button.qml
diff --git a/examples/declarative-location/landmarkmap/mobile/Floater.qml b/examples/declarative-location/landmarkmap/landmarkmapmobile/Floater.qml
index f61f48309d..f61f48309d 100644
--- a/examples/declarative-location/landmarkmap/mobile/Floater.qml
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/Floater.qml
diff --git a/examples/declarative-location/landmarkmap/mobile/ListDelegate.qml b/examples/declarative-location/landmarkmap/landmarkmapmobile/ListDelegate.qml
index 7a421f8b7e..7a421f8b7e 100755
--- a/examples/declarative-location/landmarkmap/mobile/ListDelegate.qml
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/ListDelegate.qml
diff --git a/examples/declarative-location/landmarkmap/mobile/StatusBar.qml b/examples/declarative-location/landmarkmap/landmarkmapmobile/StatusBar.qml
index ee589f6935..ee589f6935 100755
--- a/examples/declarative-location/landmarkmap/mobile/StatusBar.qml
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/StatusBar.qml
diff --git a/examples/declarative-location/landmarkmap/mobile/TitleBar.qml b/examples/declarative-location/landmarkmap/landmarkmapmobile/TitleBar.qml
index 477f8f0b29..477f8f0b29 100755
--- a/examples/declarative-location/landmarkmap/mobile/TitleBar.qml
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/TitleBar.qml
diff --git a/examples/declarative-location/landmarkmap/mobile/ToolBar.qml b/examples/declarative-location/landmarkmap/landmarkmapmobile/ToolBar.qml
index c52850e188..c52850e188 100755
--- a/examples/declarative-location/landmarkmap/mobile/ToolBar.qml
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/ToolBar.qml
diff --git a/examples/declarative-location/landmarkmap/mobile/images/gloss.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/gloss.png
index 5d370cd93d..5d370cd93d 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/gloss.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/gloss.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/landmarkstar.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/landmarkstar.png
index baf2454bc8..baf2454bc8 100644
--- a/examples/declarative-location/landmarkmap/mobile/images/landmarkstar.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/landmarkstar.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/lineedit.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/lineedit.png
index 2cc38dc35b..2cc38dc35b 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/lineedit.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/lineedit.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/lineedit.sci b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/lineedit.sci
index 054bff78be..054bff78be 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/lineedit.sci
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/lineedit.sci
diff --git a/examples/declarative-location/landmarkmap/mobile/images/moon.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/moon.png
index 9407b2b4f0..9407b2b4f0 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/moon.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/moon.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/quit.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/quit.png
index 5bda1b6e0d..5bda1b6e0d 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/quit.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/quit.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/star.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/star.png
index 27ef924267..27ef924267 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/star.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/star.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/stripes.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/stripes.png
index 9f36727ea4..9f36727ea4 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/stripes.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/stripes.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/sun.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/sun.png
index 7713ca5ce7..7713ca5ce7 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/sun.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/sun.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/titlebar.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/titlebar.png
index 51c90082d0..51c90082d0 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/titlebar.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/titlebar.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/titlebar.sci b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/titlebar.sci
index 0418d94cd6..0418d94cd6 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/titlebar.sci
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/titlebar.sci
diff --git a/examples/declarative-location/landmarkmap/mobile/images/toolbutton.png b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/toolbutton.png
index 11310013ee..11310013ee 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/toolbutton.png
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/toolbutton.png
diff --git a/examples/declarative-location/landmarkmap/mobile/images/toolbutton.sci b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/toolbutton.sci
index 9e4f965307..9e4f965307 100755
--- a/examples/declarative-location/landmarkmap/mobile/images/toolbutton.sci
+++ b/examples/declarative-location/landmarkmap/landmarkmapmobile/images/toolbutton.sci
diff --git a/examples/declarative-location/mapviewer/deployment.pri b/examples/declarative-location/mapviewer/deployment.pri
index 342e38d8cd..05c50ca9a1 100644
--- a/examples/declarative-location/mapviewer/deployment.pri
+++ b/examples/declarative-location/mapviewer/deployment.pri
@@ -6,3 +6,7 @@ symbian {
 }
 my_files.sources = $$my_src_dir/mapviewer.qml
 DEPLOYMENT += my_files
+
+install_files.files += $$my_src_dir/mapviewer.qml
+install_files.path = $$QT_MOBILITY_EXAMPLES
+INSTALLS += install_files
diff --git a/examples/declarative-location/mapviewer/mapviewer.pro b/examples/declarative-location/mapviewer/mapviewer.pro
index 3ea83592d4..7763b08fb4 100644
--- a/examples/declarative-location/mapviewer/mapviewer.pro
+++ b/examples/declarative-location/mapviewer/mapviewer.pro
@@ -1,7 +1,7 @@
 QT += declarative network
 SOURCES += $$PWD/qmlmapviewer.cpp
-include($$PWD/deployment.pri)
 include($$PWD/../declarative-location.pri)
+include($$PWD/deployment.pri)
 
 TARGET = qml_mapviewer
 
diff --git a/tests/declarative-location/declarative-landmark.qml b/tests/declarative-location/declarative-landmark.qml
index 7679c6698e..5d688717ad 100644
--- a/tests/declarative-location/declarative-landmark.qml
+++ b/tests/declarative-location/declarative-landmark.qml
@@ -250,8 +250,8 @@ Rectangle {
             landmarkModel.setDbFileName("generatedExampleLandmarkDb.db");
         }
         else if (action == "Set import file" ) {
-	    console.log("log: Setting import file to AUS-PublicToilet-Queensland.gpx")
-	    landmarkModel.importFile = "AUS-PublicToilet-Queensland.gpx"
+	    console.log("log: Setting import file to mylm.lmx")
+	    landmarkModel.importFile = "mylm.lmx"
         }
         else if (action == "Import" ) {
 	    console.log("log:Calling importLandmarks()")