diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-09-27 14:56:02 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2019-10-02 07:28:44 +0000 |
| commit | 10abf9d3553003b2e82f21d58a2f3abc7c048999 (patch) | |
| tree | 91a1e53f3e453d743f1686ec6688c90ad73baf5d /examples/wayland | |
| parent | f8a3681e1ac625ee74a4150a7a7f2a9cbc24e3ef (diff) | |
Set unique targets for examples that conflict
This makes it easier for CMake when we run the conversion scripts.
Task-number: QTBUG-78177
Change-Id: I304dd12b0daacba37662604847c5200e27ebfd28
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples/wayland')
5 files changed, 8 insertions, 2 deletions
diff --git a/examples/wayland/custom-extension/compositor/compositor.pro b/examples/wayland/custom-extension/compositor/compositor.pro index 751b5ca3d..6152e0a38 100644 --- a/examples/wayland/custom-extension/compositor/compositor.pro +++ b/examples/wayland/custom-extension/compositor/compositor.pro @@ -18,7 +18,7 @@ WAYLANDSERVERSOURCES += \ RESOURCES += compositor.qrc -TARGET = custom-compositor +TARGET = custom-extension-compositor HEADERS += \ customextension.h diff --git a/examples/wayland/custom-extension/cpp-client/cpp-client.pro b/examples/wayland/custom-extension/cpp-client/cpp-client.pro index 388a09bfa..6b178514e 100644 --- a/examples/wayland/custom-extension/cpp-client/cpp-client.pro +++ b/examples/wayland/custom-extension/cpp-client/cpp-client.pro @@ -9,5 +9,7 @@ SOURCES += main.cpp \ HEADERS += \ ../client-common/customextension.h +TARGET = custom-extension-cpp-client + target.path = $$[QT_INSTALL_EXAMPLES]/wayland/custom-extension/cpp-client INSTALLS += target diff --git a/examples/wayland/custom-extension/qml-client/qml-client.pro b/examples/wayland/custom-extension/qml-client/qml-client.pro index a8fa420af..bad4af2db 100644 --- a/examples/wayland/custom-extension/qml-client/qml-client.pro +++ b/examples/wayland/custom-extension/qml-client/qml-client.pro @@ -10,6 +10,8 @@ SOURCES += main.cpp \ HEADERS += \ ../client-common/customextension.h +TARGET = custom-extension-qml-client + RESOURCES += qml.qrc target.path = $$[QT_INSTALL_EXAMPLES]/wayland/custom-extension/qml-client diff --git a/examples/wayland/server-buffer/cpp-client/cpp-client.pro b/examples/wayland/server-buffer/cpp-client/cpp-client.pro index 7f785f983..45b71577b 100644 --- a/examples/wayland/server-buffer/cpp-client/cpp-client.pro +++ b/examples/wayland/server-buffer/cpp-client/cpp-client.pro @@ -9,5 +9,7 @@ SOURCES += main.cpp \ HEADERS += \ sharebufferextension.h +TARGET = server-buffer-cpp-client + target.path = $$[QT_INSTALL_EXAMPLES]/wayland/server-buffer/cpp-client INSTALLS += target diff --git a/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro b/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro index e80e9e153..c8497970e 100644 --- a/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro +++ b/examples/wayland/texture-sharing/custom-compositor/custom-compositor.pro @@ -12,7 +12,7 @@ OTHER_FILES = \ RESOURCES += compositor.qrc -TARGET = custom-compositor +TARGET = texture-sharing-custom-compositor target.path = $$[QT_INSTALL_EXAMPLES]/wayland/texture-sharing/custom-compositor INSTALLS += target |