diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-10-28 10:19:37 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-11-04 10:32:24 +0000 |
| commit | dd9324db806466dde409750e7de17d9e327865e3 (patch) | |
| tree | 463790b20a9b4222661e34dc0c8fd48d595f0f0d | |
| parent | 74b067acfe3ff4093fd7c1724ef1405731bae5e5 (diff) | |
Add install targets for new examples.
Change-Id: Ibb4ae57d82a86d5fc74679c628a5c7a9b100f71d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
5 files changed, 16 insertions, 1 deletions
diff --git a/examples/wayland/custom-extension/compositor/compositor.pro b/examples/wayland/custom-extension/compositor/compositor.pro index f38b1ecb4..4ffafdb8b 100644 --- a/examples/wayland/custom-extension/compositor/compositor.pro +++ b/examples/wayland/custom-extension/compositor/compositor.pro @@ -29,3 +29,6 @@ TARGET = custom-compositor HEADERS += \ customextension.h + +target.path = $$[QT_INSTALL_EXAMPLES]/wayland/custom-extension/compositor +INSTALLS += target diff --git a/examples/wayland/custom-extension/testapp/main.cpp b/examples/wayland/custom-extension/testapp/main.cpp index 4ff44b7f4..59738128d 100644 --- a/examples/wayland/custom-extension/testapp/main.cpp +++ b/examples/wayland/custom-extension/testapp/main.cpp @@ -98,7 +98,8 @@ int main (int argc, char **argv) s_custom = app.findChild<QObject*>("qt_example_custom_extension"); if (!s_custom) { - qCritical() << "This example requires the Qt Custom Extension platform plugin"; + qCritical() << "This example requires the Qt Custom Extension platform plugin,\n" + "add -platform custom-wayland to the command line"; return -1; } TestWindow window; diff --git a/examples/wayland/custom-extension/testapp/testapp.pro b/examples/wayland/custom-extension/testapp/testapp.pro index 8424f3bf7..062210e9a 100644 --- a/examples/wayland/custom-extension/testapp/testapp.pro +++ b/examples/wayland/custom-extension/testapp/testapp.pro @@ -1,3 +1,6 @@ SOURCES += main.cpp CONFIG += c++11 + +target.path = $$[QT_INSTALL_EXAMPLES]/wayland/custom-extension/testapp +INSTALLS += target diff --git a/examples/wayland/multi-output/multi-output.pro b/examples/wayland/multi-output/multi-output.pro index db86d4008..468dc2e09 100644 --- a/examples/wayland/multi-output/multi-output.pro +++ b/examples/wayland/multi-output/multi-output.pro @@ -11,3 +11,6 @@ OTHER_FILES = \ images/background.jpg \ RESOURCES += multi-output.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/wayland/multi-output +INSTALLS += target diff --git a/examples/wayland/pure-qml/pure-qml.pro b/examples/wayland/pure-qml/pure-qml.pro index 5dab0d767..d643d3ee0 100644 --- a/examples/wayland/pure-qml/pure-qml.pro +++ b/examples/wayland/pure-qml/pure-qml.pro @@ -10,3 +10,8 @@ OTHER_FILES = \ images/background.jpg \ RESOURCES += pure-qml.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/wayland/pure-qml +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pure-qml.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/wayland/pure-qml +INSTALLS += target sources |