From e48005a356df1683b839ddb1745409ad37a92ef6 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 26 Oct 2020 11:45:45 +0100 Subject: [PATCH] CMake: Make qtwaylandscanner depend on QtCore only It doesn't use any Gui classes at the moment. It also ensures a target dependency cycle is not created on the default_qpa_plugins custom target when the QT_QPA_DEFAULT_PLATFORM cache var is set to 'wayland'. Change-Id: I8958e5b993ad40294abf49f633d1ef31b6c633bb Reviewed-by: David Edmundson --- src/tools/qtwaylandscanner/.prev_CMakeLists.txt | 2 -- src/tools/qtwaylandscanner/CMakeLists.txt | 2 -- src/tools/qtwaylandscanner/qtwaylandscanner.pro | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/tools/qtwaylandscanner/.prev_CMakeLists.txt b/src/tools/qtwaylandscanner/.prev_CMakeLists.txt index c4c3c5a8a8a..156ef030ead 100644 --- a/src/tools/qtwaylandscanner/.prev_CMakeLists.txt +++ b/src/tools/qtwaylandscanner/.prev_CMakeLists.txt @@ -8,8 +8,6 @@ qt_get_tool_target_name(target_name qtwaylandscanner) qt_internal_add_tool(${target_name} SOURCES qtwaylandscanner.cpp - PUBLIC_LIBRARIES - Qt::Gui ) #### Keys ignored in scope 1:.:.:qtwaylandscanner.pro:: diff --git a/src/tools/qtwaylandscanner/CMakeLists.txt b/src/tools/qtwaylandscanner/CMakeLists.txt index 0d16bc85850..d18710b4232 100644 --- a/src/tools/qtwaylandscanner/CMakeLists.txt +++ b/src/tools/qtwaylandscanner/CMakeLists.txt @@ -9,8 +9,6 @@ qt_internal_add_tool(${target_name} TOOLS_TARGET WaylandScanner # special case SOURCES qtwaylandscanner.cpp - PUBLIC_LIBRARIES - Qt::Gui ) #### Keys ignored in scope 1:.:.:qtwaylandscanner.pro:: diff --git a/src/tools/qtwaylandscanner/qtwaylandscanner.pro b/src/tools/qtwaylandscanner/qtwaylandscanner.pro index ac2d07b7657..cad7bbfb6a1 100644 --- a/src/tools/qtwaylandscanner/qtwaylandscanner.pro +++ b/src/tools/qtwaylandscanner/qtwaylandscanner.pro @@ -1,6 +1,7 @@ option(host_build) SOURCES += qtwaylandscanner.cpp +QT = core load(qt_tool)