diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-11-28 15:48:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-29 16:13:18 +0100 |
| commit | 53a8c971c5ea604b6c41f84ba3f78bee2e9064c8 (patch) | |
| tree | 8834081aeead005649580e1d3e6ef8500a7285b0 | |
| parent | be13521707249d4d89085e6e850944056ab923f7 (diff) | |
| download | qtlocation-53a8c971c5ea604b6c41f84ba3f78bee2e9064c8.tar.gz | |
Fix and cleanup of make install related rules in QtLocation examples
Change-Id: I9ef400e22d46e60d50eed785a71e656a0f93fa26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | examples/location/mapviewer/mapviewer.pro | 8 | ||||
| -rw-r--r-- | examples/location/places/places.pro | 7 | ||||
| -rw-r--r-- | examples/location/places_list/places_list.pro | 4 | ||||
| -rw-r--r-- | examples/location/places_map/places_map.pro | 4 |
4 files changed, 13 insertions, 10 deletions
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index 36fead08..8c667498 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -32,10 +32,12 @@ OTHER_FILES += $$qmlcontentdialogs.files include(../common/common.pri) -target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/mapviewer - -INSTALLS += target +target.path = $$[QT_INSTALL_EXAMPLES]/location/mapviewer +additional.files = ../common +additional.path = $$[QT_INSTALL_EXAMPLES]/location/common +INSTALLS += target additional +# ensure copying of media file while shadow building !equals($${_PRO_FILE_PWD_}, $${OUT_PWD}) { MEDIAFILE = $${_PRO_FILE_PWD_}/demo.ogv copy2build.input = MEDIAFILE diff --git a/examples/location/places/places.pro b/examples/location/places/places.pro index 459a241e..fa79387d 100644 --- a/examples/location/places/places.pro +++ b/examples/location/places/places.pro @@ -37,7 +37,8 @@ OTHER_FILES += $$qmlcontentplaces.files include(../common/common.pri) -target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places - -INSTALLS += target +target.path = $$[QT_INSTALL_EXAMPLES]/location/places +additional.files = ../common +additional.path = $$[QT_INSTALL_EXAMPLES]/location/common +INSTALLS += target additional diff --git a/examples/location/places_list/places_list.pro b/examples/location/places_list/places_list.pro index 2d4b29ab..68a6d494 100644 --- a/examples/location/places_list/places_list.pro +++ b/examples/location/places_list/places_list.pro @@ -6,7 +6,7 @@ SOURCES = main.cpp qmlcontent.files += $$files(*.qml) -target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_list -qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_list +target.path = $$[QT_INSTALL_EXAMPLES]/location/places_list +qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/location/places_list INSTALLS += target qmlcontent diff --git a/examples/location/places_map/places_map.pro b/examples/location/places_map/places_map.pro index 5f7d3eaf..7f4bf81b 100644 --- a/examples/location/places_map/places_map.pro +++ b/examples/location/places_map/places_map.pro @@ -7,7 +7,7 @@ SOURCES = main.cpp qmlcontent.files += $$files(*.qml) \ marker.png -target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_map -qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_map +target.path = $$[QT_INSTALL_EXAMPLES]/location/places_map +qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/location/places_map INSTALLS += target qmlcontent |