diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-11-18 15:35:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 19:28:15 +0100 |
| commit | c4d3b333a1ec0de5ef1389569b9b65467453e382 (patch) | |
| tree | f0c107a64691115235034f25cd2b72bdd2fa2aef | |
| parent | fdfc320ab397f8f8faa4a54e54d80740487720e2 (diff) | |
Fix install path for examplesv5.2.0-rc1v5.2.0
The QtLocation examples are still broken when running make install
but the module is not part of the release anyway.
Task-number: QTBUG-34907
Change-Id: Ie3a35daae3df39747a70ed4bce430ec1a73cbe3d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | examples/location/mapviewer/mapviewer.pro | 2 | ||||
| -rw-r--r-- | examples/location/places/places.pro | 2 | ||||
| -rw-r--r-- | examples/location/places_list/places_list.pro | 4 | ||||
| -rw-r--r-- | examples/location/places_map/places_map.pro | 4 | ||||
| -rw-r--r-- | examples/positioning/flickr/flickr.pro | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro index 7ae7b4dc..36fead08 100644 --- a/examples/location/mapviewer/mapviewer.pro +++ b/examples/location/mapviewer/mapviewer.pro @@ -32,7 +32,7 @@ OTHER_FILES += $$qmlcontentdialogs.files include(../common/common.pri) -target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/mapviewer +target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/mapviewer INSTALLS += target diff --git a/examples/location/places/places.pro b/examples/location/places/places.pro index ab9b1547..459a241e 100644 --- a/examples/location/places/places.pro +++ b/examples/location/places/places.pro @@ -37,7 +37,7 @@ OTHER_FILES += $$qmlcontentplaces.files include(../common/common.pri) -target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/places +target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places INSTALLS += target diff --git a/examples/location/places_list/places_list.pro b/examples/location/places_list/places_list.pro index 238e2973..2d4b29ab 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/declarative/places_list -qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/places_list +target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_list +qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_list INSTALLS += target qmlcontent diff --git a/examples/location/places_map/places_map.pro b/examples/location/places_map/places_map.pro index 34f5ad92..5f7d3eaf 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/declarative/places_map -qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/places_map +target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_map +qmlcontent.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/places_map INSTALLS += target qmlcontent diff --git a/examples/positioning/flickr/flickr.pro b/examples/positioning/flickr/flickr.pro index ff83bcb2..9014935d 100644 --- a/examples/positioning/flickr/flickr.pro +++ b/examples/positioning/flickr/flickr.pro @@ -9,8 +9,8 @@ RESOURCES += \ OTHER_FILES += flickr.qml -target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/declarative/flickr +target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/flickr sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml flickrcommon flickrmobile -sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/declarative/flickr +sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/flickr INSTALLS += target sources |