diff options
59 files changed, 218 insertions, 94 deletions
diff --git a/examples/demos/calqlatr/calqlatr.pro b/examples/demos/calqlatr/calqlatr.pro index 024d6efa23..6a147f4ce6 100644 --- 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 00fb8d8b88..b243396986 100644 --- 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 cbe0c8ed0d..fa2e4b5709 100644 --- 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 80d3d2992b..2f7afef5a5 100644 --- 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 aa2f1cfbea..dfa1924946 100644 --- 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 691bd6d293..36f4377de1 100644 --- 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 5af19010c7..f2b7a2dddf 100644 --- 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 dd2eb80250..d9058700ff 100644 --- 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 4cce7eda4f..504f9f77c1 100644 --- 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 9f91ae110b..231be91f01 100644 --- 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 1f087d4d57..80043799b0 100644 --- 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 890726ebcc..aae8e83c71 100644 --- 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 2898bec628..17d4816138 100644 --- 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 a4edaa9ccb..5592f70ee3 100644 --- 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 9623bb5acb..7cc3165483 100644 --- 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 09bbef495d..135f4da627 100644 --- 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 6cbc24a7b8..3195dfd7a2 100644 --- 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 ce5efbb823..6bc620fbf0 100644 --- 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 a1aec4da91..a6c2fc65ed 100644 --- 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 20956f9be6..247db55cee 100644 --- 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 2cd619a085..86787c7654 100644 --- 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 ff3e264776..e053ac21cb 100644 --- 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 130e45bb47..80bee64461 100644 --- 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 73f755aa87..5b21d90447 100644 --- 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 fa49f1cc78..afd1c15668 100644 --- 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 459ef080aa..a7dd996532 100644 --- 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 678cfb9ca4..c1cf877e65 100644 --- 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 4bfbd488ea..5f514bc1db 100644 --- 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 b0f37ebe94..5a021ebae0 100644 --- 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 3a5d26b0ec..d7aafb7d10 100644 --- 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 5f6b23862b..b57d550d31 100644 --- 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 033a90ba82..dbf032e11c 100644 --- 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 3f2109eac2..681e44b307 100644 --- 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 c840bdf720..edc767d709 100644 --- 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 fe7ce9a37a..9f024237a2 100644 --- 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 68a240cb5c..a401042d4e 100644 --- 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 654c3ceeb5..b812508bd7 100644 --- 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 59b0702547..846ad6307d 100644 --- 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 3db32e0dd4..7ec3e0e58a 100644 --- 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 b395490858..eddfb7429a 100644 --- 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 d98f218673..740001362e 100644 --- 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 7da02de774..695c010263 100644 --- 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 bf08c745bb..cb876e41b5 100644 --- 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 2f457e60ff..e219cdea7a 100644 --- 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 3884c7f179..2f0d430917 100644 --- 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 74005b1b08..d22aa0f5ff 100644 --- 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 8657820493..d1271e16a5 100644 --- 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 64a58b3729..f2ad3d0d85 100644 --- 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 96ffbd4fa4..22506bcfeb 100644 --- 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 10dec9996b..d8a638ca06 100644 --- 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 d3b50632c7..e85ccad38d 100644 --- 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 afd7d1ba07..b3734e29f3 100644 --- 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 a0770c9332..303a13cbaf 100644 --- 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 6b52d46a25..83919c4e8f 100644 --- 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 85edb40257..36ae0fc7f4 100644 --- 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 aa5306cceb..10ce079896 100644 --- 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 0893449746..9cb5c57c3f 100644 --- 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 b4e3886c87..5dea5d621f 100644 --- 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 c4518418f6..7939773b17 100644 --- 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 |