From aba67cc3f020f03d8ed8ef5303d413044031bc58 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 22 Nov 2012 11:33:28 +0100 Subject: 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 Reviewed-by: hjk --- examples/qml/imageprovider/imageprovider.pro | 3 +-- .../qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro | 6 ++++++ examples/qml/qml.pro | 5 +++++ examples/qml/referenceexamples/adding/adding.pro | 6 +++--- examples/qml/referenceexamples/attached/attached.pro | 6 +++--- examples/qml/referenceexamples/binding/binding.pro | 6 +++--- examples/qml/referenceexamples/coercion/coercion.pro | 6 +++--- examples/qml/referenceexamples/default/default.pro | 6 +++--- examples/qml/referenceexamples/extended/extended.pro | 6 +++--- examples/qml/referenceexamples/grouped/grouped.pro | 6 +++--- examples/qml/referenceexamples/methods/methods.pro | 6 +++--- examples/qml/referenceexamples/properties/properties.pro | 6 +++--- examples/qml/referenceexamples/referenceexamples.pro | 4 ++++ examples/qml/referenceexamples/signal/signal.pro | 6 +++--- examples/qml/referenceexamples/valuesource/valuesource.pro | 6 +++--- examples/qml/shell/shell.pro | 4 ++++ 16 files changed, 53 insertions(+), 35 deletions(-) (limited to 'examples/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 -- cgit v1.2.3