diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-10 18:47:27 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-17 12:03:29 +0200 |
| commit | 53a08ca23554c72cbcb1d84db0544d24c127d510 (patch) | |
| tree | f9359af8e4330f3507ee5a6e4f8e8bdc40869783 | |
| parent | 11b968e392d9192ba5fe7d8251811e6dc9b22e13 (diff) | |
CMake: Record QtWaylandScannerTools as a tools package dependency
The change uses new API introduced in qtbase, to register
QtWaylandScannerTools as a tools package dependency, ensuring that
the proper host prefix manipulation is done to find the host package.
This fixes the QEMU CI standalone test building by using the host
qtwaylandscanner.
Task-number: QTBUG-83968
Change-Id: I67facb32e1a1e33197090fde324755c0fc880684
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
| -rw-r--r-- | src/client/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/compositor/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 01957eacd..62bc7e09e 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -126,5 +126,5 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_draganddrop ) # special case begin -qt_record_extra_qt_package_dependency(WaylandClient WaylandScannerTools "") +qt_record_extra_qt_main_tools_package_dependency(WaylandClient WaylandScannerTools "${PROJECT_VERSION}") # special case end diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt index 08de121f3..1b07b4c67 100644 --- a/src/compositor/CMakeLists.txt +++ b/src/compositor/CMakeLists.txt @@ -232,6 +232,6 @@ endif() # special case end # special case begin -qt_record_extra_qt_package_dependency(WaylandCompositor WaylandScannerTools "") +qt_record_extra_qt_main_tools_package_dependency(WaylandCompositor WaylandScannerTools "${PROJECT_VERSION}") # special case end |