From 920387296abcead6fea2d801fb2f57c185657c47 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 18:01:30 +0200 Subject: fix example installs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this actually includes removing the install targets for the sources - this is automated now. Change-Id: I736958d70baabfa4db816abbfc50acacbf2ee23c Reviewed-by: Topi Reiniö Reviewed-by: Giulio Camuffo --- examples/wayland/qml-compositor/qml-compositor.pro | 15 ++++++++++----- .../wayland/qwindow-compositor/qwindow-compositor.pro | 4 +--- examples/wayland/server-buffer/client/client.pro | 3 +++ examples/wayland/server-buffer/compositor/compositor.pro | 4 ++++ examples/wayland/server-buffer/server-buffer.pro | 3 +++ 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 f908a2f2f..98ff96f83 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 4bab000b5..ad222860e 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 9d408d9e9..8aef051c1 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 8d7f48820..df291fbfd 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 16c556251..2f5f32b6d 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 -- cgit v1.2.3