summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.qmake.conf1
-rw-r--r--examples/positioning/flickr/flickr.pro11
-rw-r--r--examples/positioning/logfilepositionsource/logfilepositionsource.pro7
-rw-r--r--examples/positioning/weatherinfo/weatherinfo.pro11
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