diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-21 18:01:30 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-04-28 18:56:33 +0000 |
| commit | 920387296abcead6fea2d801fb2f57c185657c47 (patch) | |
| tree | 7f112d323333b27363e97c37f3b0f94a26a40e7f /examples/wayland | |
| parent | 2e08d3afc08ea305052d75a306dac381d3025134 (diff) | |
| download | qtwayland-5.6.1-1.tar.gz | |
this actually includes removing the install targets for the sources -
this is automated now.
Change-Id: I736958d70baabfa4db816abbfc50acacbf2ee23c
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'examples/wayland')
5 files changed, 21 insertions, 8 deletions
diff --git a/examples/wayland/qml-compositor/qml-compositor.pro b/examples/wayland/qml-compositor/qml-compositor.pro index f908a2f2..98ff96f8 100644 --- a/examples/wayland/qml-compositor/qml-compositor.pro +++ b/examples/wayland/qml-compositor/qml-compositor.pro @@ -14,9 +14,14 @@ QT += compositor SOURCES += main.cpp -OTHER_FILES = ContrastEffect.qml main.qml WindowChrome.qml WindowContainer.qml background.jpg closebutton.png compositor.js - +qml.files = \ + ContrastEffect.qml \ + WindowChrome.qml \ + WindowContainer.qml \ + background.jpg \ + closebutton.png \ + compositor.js \ + main.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/wayland/qml-compositor target.path = $$[QT_INSTALL_EXAMPLES]/wayland/qml-compositor -sources.files = $$OTHER_FILES $$SOURCES $$HEADERS $$RESOURCES $$FORMS qml-compositor.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/wayland/qml-compositor -INSTALLS += target sources +INSTALLS += target qml diff --git a/examples/wayland/qwindow-compositor/qwindow-compositor.pro b/examples/wayland/qwindow-compositor/qwindow-compositor.pro index 4bab000b..ad222860 100644 --- a/examples/wayland/qwindow-compositor/qwindow-compositor.pro +++ b/examples/wayland/qwindow-compositor/qwindow-compositor.pro @@ -24,6 +24,4 @@ INCLUDEPATH += $$PWD/../../include RESOURCES += qwindow-compositor.qrc target.path = $$[QT_INSTALL_EXAMPLES]/wayland/qwindow-compositor -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qwindow-compositor.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/wayland/qwindow-compositor -INSTALLS += target sources +INSTALLS += target diff --git a/examples/wayland/server-buffer/client/client.pro b/examples/wayland/server-buffer/client/client.pro index 9d408d9e..8aef051c 100644 --- a/examples/wayland/server-buffer/client/client.pro +++ b/examples/wayland/server-buffer/client/client.pro @@ -20,3 +20,6 @@ SOURCES += \ HEADERS += \ serverbufferrenderer.h + +target.path = $$[QT_INSTALL_EXAMPLES]/wayland/server-buffer/client +INSTALLS += target diff --git a/examples/wayland/server-buffer/compositor/compositor.pro b/examples/wayland/server-buffer/compositor/compositor.pro index 8d7f4882..df291fbf 100644 --- a/examples/wayland/server-buffer/compositor/compositor.pro +++ b/examples/wayland/server-buffer/compositor/compositor.pro @@ -7,6 +7,7 @@ SOURCES += \ serverbufferitem.cpp HEADERS += \ serverbufferitem.h \ + serverbuffertextureprovider.h OTHER_FILES = \ qml/main.qml \ @@ -18,3 +19,6 @@ CONFIG +=wayland-scanner WAYLANDSERVERSOURCES += ../share-buffer.xml DEFINES += QT_COMPOSITOR_QUICK + +target.path = $$[QT_INSTALL_EXAMPLES]/wayland/server-buffer/compositor +INSTALLS += target diff --git a/examples/wayland/server-buffer/server-buffer.pro b/examples/wayland/server-buffer/server-buffer.pro index 16c55625..2f5f32b6 100644 --- a/examples/wayland/server-buffer/server-buffer.pro +++ b/examples/wayland/server-buffer/server-buffer.pro @@ -1,3 +1,6 @@ TEMPLATE=subdirs SUBDIRS += client compositor + +EXAMPLE_FILES += \ + share-buffer.xml |