diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-11-28 14:21:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-29 11:51:49 +0100 |
| commit | be13521707249d4d89085e6e850944056ab923f7 (patch) | |
| tree | 66cf06b4e3411b43b900d73112b0d70d436cf594 | |
| parent | 8a908dababc1b505e521ce8f622d0d2814874200 (diff) | |
| download | qtlocation-be13521707249d4d89085e6e850944056ab923f7.tar.gz | |
Fix make install rules for all examples in QtPositioning
This was highlighted during the testing of the Qt 5.2.0 package.
Change-Id: Iab1e6f5f1e1a8ceb62fc44658ec12fb131ccad65
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | .qmake.conf | 1 | ||||
| -rw-r--r-- | examples/positioning/flickr/flickr.pro | 11 | ||||
| -rw-r--r-- | examples/positioning/logfilepositionsource/logfilepositionsource.pro | 7 | ||||
| -rw-r--r-- | examples/positioning/weatherinfo/weatherinfo.pro | 11 |
4 files changed, 14 insertions, 16 deletions
diff --git a/.qmake.conf b/.qmake.conf index 45d05b25..457f68b5 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,4 @@ load(qt_build_config) +CONFIG += qt_example_installs MODULE_VERSION = 5.2.1 diff --git a/examples/positioning/flickr/flickr.pro b/examples/positioning/flickr/flickr.pro index 9014935d..1d7cce50 100644 --- a/examples/positioning/flickr/flickr.pro +++ b/examples/positioning/flickr/flickr.pro @@ -7,10 +7,9 @@ SOURCES += qmllocationflickr.cpp RESOURCES += \ flickr.qrc -OTHER_FILES += flickr.qml +OTHER_FILES += flickr.qml \ + flickrcommon/* \ + flickrmobile/* -target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/flickr -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml flickrcommon flickrmobile -sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/flickr - -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/positioning/flickr +INSTALLS += target diff --git a/examples/positioning/logfilepositionsource/logfilepositionsource.pro b/examples/positioning/logfilepositionsource/logfilepositionsource.pro index bd00a169..59c0d86b 100644 --- a/examples/positioning/logfilepositionsource/logfilepositionsource.pro +++ b/examples/positioning/logfilepositionsource/logfilepositionsource.pro @@ -9,8 +9,7 @@ SOURCES = logfilepositionsource.cpp \ clientapplication.cpp \ main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/logfilepositionsource -sources.files = $$SOURCES $$HEADERS *.pro simplelog.txt -sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/logfilepositionsource +EXAMPLE_FILES = simplelog.txt -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/positioning/logfilepositionsource +INSTALLS += target diff --git a/examples/positioning/weatherinfo/weatherinfo.pro b/examples/positioning/weatherinfo/weatherinfo.pro index 1470b8a0..e2b2102d 100644 --- a/examples/positioning/weatherinfo/weatherinfo.pro +++ b/examples/positioning/weatherinfo/weatherinfo.pro @@ -9,14 +9,13 @@ SOURCES += main.cpp \ OTHER_FILES += weatherinfo.qml \ components/WeatherIcon.qml \ components/ForecastIcon.qml \ - components/BigForecastIcon.qml + components/BigForecastIcon.qml \ + icons/* + RESOURCES += weatherinfo.qrc HEADERS += appmodel.h -#install -target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/weatherinfo -sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/weatherinfo -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/positioning/weatherinfo +INSTALLS += target |