Fix installation of examples.

Enable examples to be built in the target tree. This entails installing
the project files and possibly other missing stuff.
Task-number: QTBUG-27977

Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

diff --git a/examples/demos/calqlatr/calqlatr.pro b/examples/demos/calqlatr/calqlatr.pro
index 024d6ef..6a147f4 100644 (file)
--- a/examples/demos/calqlatr/calqlatr.pro
+++ b/examples/demos/calqlatr/calqlatr.pro
@@ -6,4 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr
 qml.files = calqlatr.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr
-INSTALLS += target qml
+sources.files = $$SOURCES calqlatr.pro
+sources.path = $$qml.path
+INSTALLS += target sources qml

diff --git a/examples/demos/demos.pro b/examples/demos/demos.pro
index 00fb8d8..b243396 100644 (file)
--- a/examples/demos/demos.pro
+++ b/examples/demos/demos.pro
@@ -4,3 +4,8 @@ SUBDIRS =   calqlatr \
             tweetsearch \
             maroon \
             stocqt
+
+# install
+sources.files = demos.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos
+INSTALLS += sources

diff --git a/examples/demos/maroon/maroon.pro b/examples/demos/maroon/maroon.pro
index cbe0c8e..fa2e4b5 100644 (file)
--- a/examples/demos/maroon/maroon.pro
+++ b/examples/demos/maroon/maroon.pro
@@ -6,4 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon
 qml.files = maroon.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon
-INSTALLS += target qml
+sources.files = $$SOURCES maroon.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/demos/samegame/samegame.pro b/examples/demos/samegame/samegame.pro
index 80d3d29..2f7afef 100644 (file)
--- a/examples/demos/samegame/samegame.pro
+++ b/examples/demos/samegame/samegame.pro
@@ -6,4 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame
 qml.files = samegame.qml content settings.js
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame
-INSTALLS += target qml
+sources.files = $$SOURCES samegame.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/demos/stocqt/stocqt.pro b/examples/demos/stocqt/stocqt.pro
index aa2f1cf..dfa1924 100644 (file)
--- a/examples/demos/stocqt/stocqt.pro
+++ b/examples/demos/stocqt/stocqt.pro
@@ -6,4 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt
 qml.files = stocqt.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt
-INSTALLS += target qml
+sources.files = $$SOURCES stocqt.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/demos/tweetsearch/tweetsearch.pro b/examples/demos/tweetsearch/tweetsearch.pro
index 691bd6d..36f4377 100644 (file)
--- a/examples/demos/tweetsearch/tweetsearch.pro
+++ b/examples/demos/tweetsearch/tweetsearch.pro
@@ -6,4 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch
 qml.files = tweetsearch.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch
-INSTALLS += target qml
+sources.files = $$SOURCES tweetsearch.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/examples.pro b/examples/examples.pro
index 5af1901..f2b7a2d 100644 (file)
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -9,3 +9,8 @@ SUBDIRS += \
     tutorials \
     window \
     qmltest
+
+# install
+sources.files = shared examples.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/
+INSTALLS += sources

diff --git a/examples/localstorage/localstorage.pro b/examples/localstorage/localstorage.pro
index dd2eb80..d905870 100644 (file)
--- a/examples/localstorage/localstorage.pro
+++ b/examples/localstorage/localstorage.pro
@@ -1,2 +1,7 @@
 TEMPLATE = subdirs
 SUBDIRS += localstorage
+
+# install
+sources.files = localstorage.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage
+INSTALLS += sources

diff --git a/examples/localstorage/localstorage/localstorage.pro b/examples/localstorage/localstorage/localstorage.pro
index 4cce7ed..504f9f7 100644 (file)
--- a/examples/localstorage/localstorage/localstorage.pro
+++ b/examples/localstorage/localstorage/localstorage.pro
@@ -3,7 +3,9 @@ TEMPLATE = app
 QT += quick qml
 SOURCES += main.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage
 qml.files = localstorage.qml hello.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage
-INSTALLS += target qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage
+sources.files = $$SOURCES localstorage.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/particles/affectors/affectors.pro b/examples/particles/affectors/affectors.pro
index 9f91ae1..231be91 100644 (file)
--- a/examples/particles/affectors/affectors.pro
+++ b/examples/particles/affectors/affectors.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors
 qml.files = affectors.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors
-INSTALLS += target qml
-
+sources.files = $$SOURCES affectors.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/particles/customparticle/customparticle.pro b/examples/particles/customparticle/customparticle.pro
index 1f087d4..8004379 100644 (file)
--- a/examples/particles/customparticle/customparticle.pro
+++ b/examples/particles/customparticle/customparticle.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle
 qml.files = customparticle.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle
-INSTALLS += target qml
-
+sources.files = $$SOURCES customparticle.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/particles/emitters/emitters.pro b/examples/particles/emitters/emitters.pro
index 890726e..aae8e83 100644 (file)
--- a/examples/particles/emitters/emitters.pro
+++ b/examples/particles/emitters/emitters.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters
 qml.files = emitters.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters
-INSTALLS += target qml
-
+sources.files = $$SOURCES emitters.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/particles/imageparticle/imageparticle.pro b/examples/particles/imageparticle/imageparticle.pro
index 2898bec..17d4816 100644 (file)
--- a/examples/particles/imageparticle/imageparticle.pro
+++ b/examples/particles/imageparticle/imageparticle.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle
 qml.files = imageparticle.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle
-INSTALLS += target qml
-
+sources.files = $$SOURCES imageparticle.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/particles/particles.pro b/examples/particles/particles.pro
index a4edaa9..5592f70 100644 (file)
--- a/examples/particles/particles.pro
+++ b/examples/particles/particles.pro
@@ -8,4 +8,6 @@ SUBDIRS += affectors \
 #Install shared images too
 qml.files = images
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles
-INSTALLS = qml
+sources.files = particles.pro
+sources.path = $$qml.path
+INSTALLS = sources qml

diff --git a/examples/particles/system/system.pro b/examples/particles/system/system.pro
index 9623bb5..7cc3165 100644 (file)
--- a/examples/particles/system/system.pro
+++ b/examples/particles/system/system.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system
 qml.files = system.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system
-INSTALLS += target qml
-
+sources.files = $$SOURCES system.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/qml/imageprovider/imageprovider.pro b/examples/qml/imageprovider/imageprovider.pro
index 09bbef4..135f4da 100644 (file)
--- a/examples/qml/imageprovider/imageprovider.pro
+++ b/examples/qml/imageprovider/imageprovider.pro
@@ -9,7 +9,7 @@ SOURCES += imageprovider.cpp
 
 OTHER_FILES += imageprovider.json
 
-sources.files = $$SOURCES imageprovider.qml imageprovider.pro
+sources.files = $$SOURCES imageprovider.qml imageprovider.pro $$OTHER_FILES
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore
@@ -19,4 +19,3 @@ ImageProviderCore_sources.files = \
 ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore
 
 INSTALLS = sources ImageProviderCore_sources target
-

diff --git a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 6cbc24a..3195dfd 100644 (file)
--- a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -2,3 +2,9 @@ QT += qml quick network
 
 SOURCES += main.cpp 
 RESOURCES += networkaccessmanagerfactory.qrc
+
+sources.files = $$SOURCES $$RESOURCES networkaccessmanagerfactory.pro view.qml
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/networkaccessmanagerfactory
+target.path = $$sources.path
+
+INSTALLS = sources target

diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro
index ce5efbb..6bc620f 100644 (file)
--- a/examples/qml/qml.pro
+++ b/examples/qml/qml.pro
@@ -5,3 +5,8 @@ SUBDIRS +=imageprovider \
           networkaccessmanagerfactory \
           referenceexamples \
           shell
+
+#Install
+sources.files = qml.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml
+INSTALLS += sources

diff --git a/examples/qml/referenceexamples/adding/adding.pro b/examples/qml/referenceexamples/adding/adding.pro
index a1aec4d..a6c2fc6 100644 (file)
--- a/examples/qml/referenceexamples/adding/adding.pro
+++ b/examples/qml/referenceexamples/adding/adding.pro
@@ -5,7 +5,7 @@ SOURCES += main.cpp \
 HEADERS += person.h
 RESOURCES += adding.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/adding
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/adding
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/adding
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/attached/attached.pro b/examples/qml/referenceexamples/attached/attached.pro
index 20956f9..247db55 100644 (file)
--- a/examples/qml/referenceexamples/attached/attached.pro
+++ b/examples/qml/referenceexamples/attached/attached.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += attached.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/attached
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/attached
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/attached
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/binding/binding.pro b/examples/qml/referenceexamples/binding/binding.pro
index 2cd619a..86787c7 100644 (file)
--- a/examples/qml/referenceexamples/binding/binding.pro
+++ b/examples/qml/referenceexamples/binding/binding.pro
@@ -9,7 +9,7 @@ HEADERS += person.h \
            happybirthdaysong.h
 
 RESOURCES += binding.qrc
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/binding
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/binding
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/binding
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/coercion/coercion.pro b/examples/qml/referenceexamples/coercion/coercion.pro
index ff3e264..e053ac2 100644 (file)
--- a/examples/qml/referenceexamples/coercion/coercion.pro
+++ b/examples/qml/referenceexamples/coercion/coercion.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += coercion.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/coercion
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/coercion
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/coercion
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/default/default.pro b/examples/qml/referenceexamples/default/default.pro
index 130e45b..80bee64 100644 (file)
--- a/examples/qml/referenceexamples/default/default.pro
+++ b/examples/qml/referenceexamples/default/default.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += default.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/default
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/default
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/default
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/extended/extended.pro b/examples/qml/referenceexamples/extended/extended.pro
index 73f755a..5b21d90 100644 (file)
--- a/examples/qml/referenceexamples/extended/extended.pro
+++ b/examples/qml/referenceexamples/extended/extended.pro
@@ -5,7 +5,7 @@ SOURCES += main.cpp \
 HEADERS += lineedit.h
 RESOURCES += extended.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/extended
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/extended
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/extended
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/grouped/grouped.pro b/examples/qml/referenceexamples/grouped/grouped.pro
index fa49f1c..afd1c15 100644 (file)
--- a/examples/qml/referenceexamples/grouped/grouped.pro
+++ b/examples/qml/referenceexamples/grouped/grouped.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += grouped.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/grouped
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/grouped
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/grouped
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/methods/methods.pro b/examples/qml/referenceexamples/methods/methods.pro
index 459ef08..a7dd996 100644 (file)
--- a/examples/qml/referenceexamples/methods/methods.pro
+++ b/examples/qml/referenceexamples/methods/methods.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += methods.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/methods
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/methods
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/methods
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/properties/properties.pro b/examples/qml/referenceexamples/properties/properties.pro
index 678cfb9..c1cf877 100644 (file)
--- a/examples/qml/referenceexamples/properties/properties.pro
+++ b/examples/qml/referenceexamples/properties/properties.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += properties.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/properties
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/properties
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/properties
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/referenceexamples.pro b/examples/qml/referenceexamples/referenceexamples.pro
index 4bfbd48..5f514bc 100644 (file)
--- a/examples/qml/referenceexamples/referenceexamples.pro
+++ b/examples/qml/referenceexamples/referenceexamples.pro
@@ -13,3 +13,7 @@ SUBDIRS += \
     methods
 
 !contains(QT_CONFIG, no-widgets): SUBDIRS += extended
+
+sources.files = referenceexamples.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples
+INSTALLS += sources

diff --git a/examples/qml/referenceexamples/signal/signal.pro b/examples/qml/referenceexamples/signal/signal.pro
index b0f37eb..5a021eb 100644 (file)
--- a/examples/qml/referenceexamples/signal/signal.pro
+++ b/examples/qml/referenceexamples/signal/signal.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += signal.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/signal
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/signal
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/signal
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/referenceexamples/valuesource/valuesource.pro b/examples/qml/referenceexamples/valuesource/valuesource.pro
index 3a5d26b..d7aafb7 100644 (file)
--- a/examples/qml/referenceexamples/valuesource/valuesource.pro
+++ b/examples/qml/referenceexamples/valuesource/valuesource.pro
@@ -9,7 +9,7 @@ HEADERS += person.h \
            happybirthdaysong.h
 RESOURCES += valuesource.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/valuesource
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/extending/valuesource
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/valuesource
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro example.qml
+sources.path = $$target.path
 INSTALLS += target sources

diff --git a/examples/qml/shell/shell.pro b/examples/qml/shell/shell.pro
index 5f6b238..b57d550 100644 (file)
--- a/examples/qml/shell/shell.pro
+++ b/examples/qml/shell/shell.pro
@@ -5,3 +5,7 @@ mac:CONFIG -= app_bundle
 
 SOURCES += main.cpp
 
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/shell
+sources.files = $$SOURCES shell.pro
+sources.path = $$target.path
+INSTALLS += target sources

diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
index 033a90b..dbf032e 100644 (file)
--- a/examples/qmltest/qmltest/qmltest.pro
+++ b/examples/qmltest/qmltest/qmltest.pro
@@ -3,5 +3,9 @@ TARGET=tst_qmltestexample
 CONFIG += qmltestcase
 SOURCES += tst_qmltest.cpp
 
-# Don't install by default
-CONFIG += no_testcase_installs
+# Note: Normally, tests are auto-installed to a test-specific directory. Overwritten here
+# so this one will end up in the examples tree.
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qmltest
+sources.files = $$SOURCES qmltest.pro *.qml
+sources.path = $$target.path
+INSTALLS = sources target

diff --git a/examples/quick/accessibility/accessibility.pro b/examples/quick/accessibility/accessibility.pro
index 3f2109e..681e44b 100644 (file)
--- a/examples/quick/accessibility/accessibility.pro
+++ b/examples/quick/accessibility/accessibility.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility
 qml.files = accessibility.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility
-INSTALLS += target qml
-
+sources.files = $$SOURCES accessibility.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/animation/animation.pro b/examples/quick/animation/animation.pro
index c840bdf..edc767d 100644 (file)
--- a/examples/quick/animation/animation.pro
+++ b/examples/quick/animation/animation.pro
@@ -6,5 +6,7 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation
 qml.files = animation.qml  basics  behaviors  easing pathanimation  pathinterpolator  states
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation
-INSTALLS += target qml
+sources.files = $$SOURCES animation.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml
 

diff --git a/examples/quick/canvas/canvas.pro b/examples/quick/canvas/canvas.pro
index fe7ce9a..9f02423 100644 (file)
--- a/examples/quick/canvas/canvas.pro
+++ b/examples/quick/canvas/canvas.pro
@@ -6,4 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas
 qml.files = canvas.qml bezierCurve clip quadraticCurveTo roundedrect smile squircle tiger contents
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas
-INSTALLS += target qml
\ No newline at end of file
+sources.files = $$SOURCES canvas.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/customitems/customitems.pro b/examples/quick/customitems/customitems.pro
index 68a240c..a401042 100644 (file)
--- a/examples/quick/customitems/customitems.pro
+++ b/examples/quick/customitems/customitems.pro
@@ -10,3 +10,8 @@ SUBDIRS = \
     #spinner \
     #tabwidget \
     maskedmousearea
+
+# install
+sources.files = customitems.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems
+INSTALLS += sources

diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
index 654c3ce..b812508 100644 (file)
--- a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
+++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro
@@ -7,8 +7,9 @@ HEADERS += maskedmousearea.h
 SOURCES += main.cpp \
            maskedmousearea.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/maskedmousearea
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/maskedmousearea
 qml.files = maskedmousearea.qml images
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/maskedmousearea
-INSTALLS += target qml
-
+qml.path = $$target.path
+sources.files = $$SOURCES $$HEADERS maskedmousearea.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro
index 59b0702..846ad63 100644 (file)
--- a/examples/quick/customitems/painteditem/painteditem.pro
+++ b/examples/quick/customitems/painteditem/painteditem.pro
@@ -13,13 +13,12 @@ OTHER_FILES += textballoon.json
 
 DESTDIR = TextBalloonPlugin
 
+INSTALL_PATH = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/painteditem/
 qdeclarativesources.files += \
-    TextBalloonPlugin/qmldir
-
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/painteditem/TextBalloonPlugin
- 
-sources.files = textballoons.qml
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/painteditem
-target.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/painteditem/TextBalloonPlugin
+    TextBalloonPlugin/qmldir TextBalloonPlugin/plugin.h
+qdeclarativesources.path += $$INSTALL_PATH/TextBalloonPlugin
+sources.files = textballoons.qml $$SOURCES textballoon.h $$OTHER_FILES painteditem.pro
+sources.path = $$INSTALL_PATH
+target.path = $$INSTALL_PATH/TextBalloonPlugin
 
 INSTALLS = qdeclarativesources sources target

diff --git a/examples/quick/draganddrop/draganddrop.pro b/examples/quick/draganddrop/draganddrop.pro
index 3db32e0..7ec3e0e 100644 (file)
--- a/examples/quick/draganddrop/draganddrop.pro
+++ b/examples/quick/draganddrop/draganddrop.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop
 qml.files = draganddrop.qml tiles views
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop
-INSTALLS += target qml
-
+sources.files = $$SOURCES draganddrop.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/imageelements/imageelements.pro b/examples/quick/imageelements/imageelements.pro
index b395490..eddfb74 100644 (file)
--- a/examples/quick/imageelements/imageelements.pro
+++ b/examples/quick/imageelements/imageelements.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements
 qml.files = *.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements
-INSTALLS += target qml
-
+sources.files = $$SOURCES imageelements.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/keyinteraction/keyinteraction.pro b/examples/quick/keyinteraction/keyinteraction.pro
index d98f218..7400013 100644 (file)
--- a/examples/quick/keyinteraction/keyinteraction.pro
+++ b/examples/quick/keyinteraction/keyinteraction.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction
 qml.files = keyinteraction.qml focus
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction
-INSTALLS += target qml
-
+sources.files = $$SOURCES keyinteraction.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/modelviews/modelviews.pro b/examples/quick/modelviews/modelviews.pro
index 7da02de..695c010 100644 (file)
--- a/examples/quick/modelviews/modelviews.pro
+++ b/examples/quick/modelviews/modelviews.pro
@@ -14,5 +14,6 @@ qml.files = \
         visualdatamodel \
         visualitemmodel
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews
-INSTALLS += target qml
-
+sources.files = $$SOURCES modelviews.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/mousearea/mousearea.pro b/examples/quick/mousearea/mousearea.pro
index bf08c74..cb876e4 100644 (file)
--- a/examples/quick/mousearea/mousearea.pro
+++ b/examples/quick/mousearea/mousearea.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea
 qml.files = mousearea.qml
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea
-INSTALLS += target qml
-
+sources.files = $$SOURCES mousearea.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/positioners/positioners.pro b/examples/quick/positioners/positioners.pro
index 2f457e6..e219cde 100644 (file)
--- a/examples/quick/positioners/positioners.pro
+++ b/examples/quick/positioners/positioners.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners
 qml.files = positioners.qml positioners-transitions.qml positioners-attachedproperties.qml
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners
-INSTALLS += target qml
-
+sources.files = $$SOURCES positioners.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index 3884c7f..2f0d430 100644 (file)
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -15,3 +15,8 @@ SUBDIRS = accessibility \
             threading \
             touchinteraction \
             customitems
+
+# install
+sources.files = quick.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick
+INSTALLS += sources

diff --git a/examples/quick/righttoleft/righttoleft.pro b/examples/quick/righttoleft/righttoleft.pro
index 74005b1..d22aa0f 100644 (file)
--- a/examples/quick/righttoleft/righttoleft.pro
+++ b/examples/quick/righttoleft/righttoleft.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft
 qml.files = righttoleft.qml layoutdirection layoutmirroring textalignment
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft
-INSTALLS += target qml
-
+sources.files = $$SOURCES righttoleft.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.pro b/examples/quick/scenegraph/customgeometry/customgeometry.pro
index 8657820..d1271e1 100644 (file)
--- a/examples/quick/scenegraph/customgeometry/customgeometry.pro
+++ b/examples/quick/scenegraph/customgeometry/customgeometry.pro
@@ -8,3 +8,7 @@ SOURCES += \
 HEADERS += \
     beziercurve.h
 
+sources.files = $$SOURCES $$HEADERS customgeometry.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/customgeometry
+target.path = $$sources.path
+INSTALLS += sources target

diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro
index 64a58b3..f2ad3d0 100644 (file)
--- a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro
+++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro
@@ -4,3 +4,8 @@ HEADERS += squircle.h
 SOURCES += squircle.cpp main.cpp
 
 OTHER_FILES += main.qml
+
+sources.files = $$SOURCES $$HEADERS $$OTHER_FILES openglunderqml.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/openglunderqml
+target.path = $$sources.path
+INSTALLS += sources target

diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro
index 96ffbd4..22506bc 100644 (file)
--- a/examples/quick/scenegraph/scenegraph.pro
+++ b/examples/quick/scenegraph/scenegraph.pro
@@ -1,4 +1,7 @@
-
 TEMPLATE = subdirs
 SUBDIRS += customgeometry simplematerial openglunderqml
 
+# install
+sources.files = scenegraph.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph
+INSTALLS += sources

diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.pro b/examples/quick/scenegraph/simplematerial/simplematerial.pro
index 10dec99..d8a638c 100644 (file)
--- a/examples/quick/scenegraph/simplematerial/simplematerial.pro
+++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro
@@ -6,3 +6,8 @@ SOURCES += \
 
 OTHER_FILES += \
     test.qml
+
+sources.files = $$SOURCES $$OTHER_FILES simplematerial.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/simplematerial
+target.path = $$sources.path
+INSTALLS += sources target

diff --git a/examples/quick/shadereffects/shadereffects.pro b/examples/quick/shadereffects/shadereffects.pro
index d3b5063..e85ccad 100644 (file)
--- a/examples/quick/shadereffects/shadereffects.pro
+++ b/examples/quick/shadereffects/shadereffects.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects
 qml.files = shadereffects.qml content
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects
-INSTALLS += target qml
-
+sources.files = $$SOURCES shadereffects.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/text/text.pro b/examples/quick/text/text.pro
index afd7d1b..b3734e2 100644 (file)
--- a/examples/quick/text/text.pro
+++ b/examples/quick/text/text.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text
 qml.files = fonts imgtag styledtext-layout.qml text.qml textselection
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text
-INSTALLS += target qml
-
+sources.files = $$SOURCES text.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/threading/threading.pro b/examples/quick/threading/threading.pro
index a0770c9..303a13c 100644 (file)
--- a/examples/quick/threading/threading.pro
+++ b/examples/quick/threading/threading.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading
 qml.files = threading.qml threadedlistmodel workerscript
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading
-INSTALLS += target qml
-
+sources.files = $$SOURCES threading.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/quick/touchinteraction/touchinteraction.pro b/examples/quick/touchinteraction/touchinteraction.pro
index 6b52d46..83919c4 100644 (file)
--- a/examples/quick/touchinteraction/touchinteraction.pro
+++ b/examples/quick/touchinteraction/touchinteraction.pro
@@ -6,5 +6,6 @@ SOURCES += main.cpp
 target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction
 qml.files = flickable multipointtouch pincharea touchinteraction.qml
 qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction
-INSTALLS += target qml
-
+sources.files = $$SOURCES touchinteraction.pro
+sources.path = $$qml.path
+INSTALLS += sources target qml

diff --git a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro
index 85edb40..36ae0fc 100644 (file)
--- a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro
+++ b/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro
@@ -15,3 +15,8 @@ HEADERS +=     directory.h \
 SOURCES +=    directory.cpp \
         file.cpp \
         dialogPlugin.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials/gettingStartedQml/filedialog
+sources.files = $$SOURCES $$HEADERS filedialog.pro
+sources.path = $$target.path
+INSTALLS = sources target

diff --git a/examples/tutorials/gettingStartedQml/gettingStartedQml.pro b/examples/tutorials/gettingStartedQml/gettingStartedQml.pro
index aa5306c..10ce079 100644 (file)
--- a/examples/tutorials/gettingStartedQml/gettingStartedQml.pro
+++ b/examples/tutorials/gettingStartedQml/gettingStartedQml.pro
@@ -2,3 +2,7 @@ TEMPLATE      = subdirs
 SUBDIRS       = \
                 filedialog\
 
+# install
+sources.files = gettingStartedQml.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials/gettingStartedQml
+INSTALLS += sources

diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro
index 0893449..9cb5c57 100644 (file)
--- a/examples/tutorials/tutorials.pro
+++ b/examples/tutorials/tutorials.pro
@@ -1,2 +1,7 @@
 TEMPLATE = subdirs
 SUBDIRS += gettingStartedQml
+
+# install
+sources.files = tutorials.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials
+INSTALLS += sources

diff --git a/examples/window/window.pro b/examples/window/window.pro
index b4e3886..5dea5d6 100644 (file)
--- a/examples/window/window.pro
+++ b/examples/window/window.pro
@@ -2,3 +2,8 @@ TEMPLATE = subdirs
 SUBDIRS += \
     #screen \
     window
+
+# install
+sources.files = window.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/window
+INSTALLS += sources

diff --git a/examples/window/window/window.pro b/examples/window/window/window.pro
index c451841..7939773 100644 (file)
--- a/examples/window/window/window.pro
+++ b/examples/window/window/window.pro
@@ -3,3 +3,9 @@ CONFIG += qt
 QT += qml
 
 SOURCES += window.cpp
+OTHER_FILES = Window.qml nogui.qml standalone.qml twowindows.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/window/window
+sources.files = $$SOURCES $$OTHER_FILES window.pro
+sources.path = $$target.path
+INSTALLS = sources target