diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-24 16:23:53 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-26 09:57:22 +0000 |
| commit | e4cb32970cc1111d7bce95293e6766a879a6b5f7 (patch) | |
| tree | c637be5f9e9a654c949dc2ce00d60c3c97ba8f99 /examples/wayland/custom-extension | |
| parent | b77269ff500e184237d523496e17639c94009ac8 (diff) | |
CMake: Regenerate and adjust projects after merge
Some of the changes that were needed
- adjusted wayland macros due to changed target names for plugins
- a few direct moc file includes, to get rid of compilation errors
- Threads::Threads linking for a few tests
- a few special cases for QT_FOR_PRIVATE handling because pro2cmake
doesn't handle those correctly at the moment (they map to
PRIVATE_MODULE_INTERFACE rather than PRIVATE_LIBRARIES)
- just regenerating all projects
Change-Id: I418ce91b1c69c7388d41eb22b94a93a9e80fa732
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/wayland/custom-extension')
| -rw-r--r-- | examples/wayland/custom-extension/cpp-client/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | examples/wayland/custom-extension/qml-client/CMakeLists.txt | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt index 8f3708a19..ffdc34b70 100644 --- a/examples/wayland/custom-extension/cpp-client/CMakeLists.txt +++ b/examples/wayland/custom-extension/cpp-client/CMakeLists.txt @@ -24,13 +24,10 @@ qt6_generate_wayland_protocol_client_sources(custom-extension-cpp-client FILES ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml ) -target_link_libraries(custom-extension-cpp-client PRIVATE - Qt::GuiPrivate -) - target_link_libraries(custom-extension-cpp-client PUBLIC Qt::Core Qt::Gui + Qt::GuiPrivate Qt::WaylandClient ) diff --git a/examples/wayland/custom-extension/qml-client/CMakeLists.txt b/examples/wayland/custom-extension/qml-client/CMakeLists.txt index f490b507d..9ce56593b 100644 --- a/examples/wayland/custom-extension/qml-client/CMakeLists.txt +++ b/examples/wayland/custom-extension/qml-client/CMakeLists.txt @@ -26,13 +26,10 @@ qt6_generate_wayland_protocol_client_sources(custom-extension-qml-client FILES ${CMAKE_CURRENT_SOURCE_DIR}/../protocol/custom.xml ) -target_link_libraries(custom-extension-qml-client PRIVATE - Qt::GuiPrivate -) - target_link_libraries(custom-extension-qml-client PUBLIC Qt::Core Qt::Gui + Qt::GuiPrivate Qt::Qml Qt::Quick Qt::WaylandClient |