diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2012-11-22 11:33:28 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-22 14:10:05 +0100 |
commit | aba67cc3f020f03d8ed8ef5303d413044031bc58 (patch) | |
tree | 7eedf57d46e6d1cb0223d8e6e455011cf914a0f1 /examples/qml/referenceexamples | |
parent | 8fc95e65e77328c995ef4a3a633a95c86f5e0bdf (diff) |
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>
Diffstat (limited to 'examples/qml/referenceexamples')
12 files changed, 37 insertions, 33 deletions
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 |