centralize and fixup example sources install targetsv5.0.0-rc1

This follows suit with aeb036e in qtbase.

Change-Id: I3b93a30194cddd7514f05ce915eecb2e1ed6433c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

8 files changed, 14 insertions, 41 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e45..5de255cb 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,2 @@
 load(qt_build_config)
+CONFIG += qt_example_installs
diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro
index 43ffcb98..4b7d5f84 100644
--- a/examples/xmlpatterns/filetree/filetree.pro
+++ b/examples/xmlpatterns/filetree/filetree.pro
@@ -5,11 +5,8 @@ QT += widgets xmlpatterns
 RESOURCES += queries.qrc
 INCLUDEPATH += ../shared/
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/filetree
-sources.files = $$SOURCES $$HEADERS $$RESOURCES forms queries *.pro *.xq *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/filetree
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/filetree
+INSTALLS += target
 
 maemo5: CONFIG += qt_example
 
diff --git a/examples/xmlpatterns/recipes/recipes.pro b/examples/xmlpatterns/recipes/recipes.pro
index 44c25576..633138b9 100644
--- a/examples/xmlpatterns/recipes/recipes.pro
+++ b/examples/xmlpatterns/recipes/recipes.pro
@@ -6,10 +6,8 @@ RESOURCES   = recipes.qrc
 SOURCES     = main.cpp querymainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
 INCLUDEPATH += ../shared/
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/recipes
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xq *.html forms files
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/recipes
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/recipes
+INSTALLS += target
 
 maemo5: CONFIG += qt_example
 
diff --git a/examples/xmlpatterns/schema/schema.pro b/examples/xmlpatterns/schema/schema.pro
index cc57ef4c..dd563754 100644
--- a/examples/xmlpatterns/schema/schema.pro
+++ b/examples/xmlpatterns/schema/schema.pro
@@ -5,10 +5,8 @@ RESOURCES   = schema.qrc
 SOURCES     = main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
 INCLUDEPATH += ../shared/
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/schema
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xq *.html files
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/schema
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/schema
+INSTALLS += target
 
 maemo5: CONFIG += qt_example
 
diff --git a/examples/xmlpatterns/trafficinfo/trafficinfo.pro b/examples/xmlpatterns/trafficinfo/trafficinfo.pro
index dcde8dff..fd71fac7 100644
--- a/examples/xmlpatterns/trafficinfo/trafficinfo.pro
+++ b/examples/xmlpatterns/trafficinfo/trafficinfo.pro
@@ -3,10 +3,8 @@ HEADERS     = mainwindow.h stationdialog.h stationquery.h timequery.h
 SOURCES     = main.cpp mainwindow.cpp stationdialog.cpp stationquery.cpp timequery.cpp
 FORMS       = stationdialog.ui
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/trafficinfo
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/trafficinfo
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/xmlpatterns/trafficinfo
+INSTALLS += target
 
 maemo5: CONFIG += qt_example
 
diff --git a/examples/xmlpatterns/xmlpatterns.pro b/examples/xmlpatterns/xmlpatterns.pro
index ea9c719a..ede6b3a1 100644
--- a/examples/xmlpatterns/xmlpatterns.pro
+++ b/examples/xmlpatterns/xmlpatterns.pro
@@ -2,8 +2,6 @@ TEMPLATE = subdirs
 SUBDIRS += xquery
 !contains(QT_CONFIG, no-widgets): SUBDIRS += filetree trafficinfo schema recipes
 
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns
-sources.files = xmlpatterns.pro shared
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns
-INSTALLS += target sources
+EXAMPLE_FILES = \
+    shared
+
diff --git a/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro b/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro
deleted file mode 100644
index c3128b0f..00000000
--- a/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-# We don't have any C++ files to build, so in order to trick qmake which
-# doesn't understand that, we use the subdirs template, but without specifying
-# any subdirs.
-TEMPLATE = subdirs
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery/globalVariables
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.cpp *.pro *.xq *.html globals.gccxml
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery/globalVariables
-INSTALLS += target sources
-
-maemo5: CONFIG += qt_example
diff --git a/examples/xmlpatterns/xquery/xquery.pro b/examples/xmlpatterns/xquery/xquery.pro
index 0084f1dd..ee1c9c89 100644
--- a/examples/xmlpatterns/xquery/xquery.pro
+++ b/examples/xmlpatterns/xquery/xquery.pro
@@ -1,10 +1,4 @@
-TEMPLATE = subdirs
-SUBDIRS += globalVariables
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xquery.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtxmlpatterns/xmlpatterns/xquery
-INSTALLS += target sources
+TEMPLATE = aux
+EXAMPLE_FILES = globalVariables
 
 maemo5: CONFIG += qt_example