diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 14:27:53 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 14:33:53 +0200 |
| commit | 48e30da0902ba0775a04745d091abea49742fb89 (patch) | |
| tree | 93af66909d9c0099ba36891d09844eb029dc1bc2 | |
| parent | d636d86206f5b32667709bf9a7717460cc5b17a0 (diff) | |
CMake: Regenerate projects
We need the qt_add_tool changes to successfully configure qemu builds.
The rest of the changes are just to be in sync with the .pro files.
Change-Id: I64e92edc2486a71c88bd964a07adf502481b200d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/qtwaylandscanner/.prev_CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/qtwaylandscanner/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/manual/scaling-compositor/CMakeLists.txt | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/qtwaylandscanner/.prev_CMakeLists.txt b/src/qtwaylandscanner/.prev_CMakeLists.txt index bb413544c..baa16eaeb 100644 --- a/src/qtwaylandscanner/.prev_CMakeLists.txt +++ b/src/qtwaylandscanner/.prev_CMakeLists.txt @@ -4,7 +4,8 @@ ## qtwaylandscanner Tool: ##################################################################### -qt_add_tool(qtwaylandscanner +qt_get_tool_target_name(target_name qtwaylandscanner) +qt_add_tool(${target_name} SOURCES qtwaylandscanner.cpp PUBLIC_LIBRARIES diff --git a/src/qtwaylandscanner/CMakeLists.txt b/src/qtwaylandscanner/CMakeLists.txt index 17254afc3..74acf3419 100644 --- a/src/qtwaylandscanner/CMakeLists.txt +++ b/src/qtwaylandscanner/CMakeLists.txt @@ -4,7 +4,8 @@ ## qtwaylandscanner Tool: ##################################################################### -qt_add_tool(qtwaylandscanner +qt_get_tool_target_name(target_name qtwaylandscanner) +qt_add_tool(${target_name} TOOLS_TARGET WaylandScanner # special case SOURCES qtwaylandscanner.cpp diff --git a/tests/manual/scaling-compositor/CMakeLists.txt b/tests/manual/scaling-compositor/CMakeLists.txt index 2446fb7f8..af6e5bd6d 100644 --- a/tests/manual/scaling-compositor/CMakeLists.txt +++ b/tests/manual/scaling-compositor/CMakeLists.txt @@ -11,7 +11,6 @@ qt_add_manual_test(scaling-compositor PUBLIC_LIBRARIES Qt::Gui Qt::Qml - Qt::QuickControls2 ) # Resources: |