From 7ec0786d78c7420244d488553d7d10eee4fe60b2 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Tue, 4 Aug 2020 11:22:58 +0200
Subject: [PATCH] CMake: Don't build debug tools by default in
 debug_and_release builds

Fixes: QTBUG-85411
Change-Id: Idd9664d1a9143c31f28549a72823a82df1cff7ec
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtApp.cmake   | 5 +++++
 cmake/QtBuild.cmake | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/cmake/QtApp.cmake b/cmake/QtApp.cmake
index ca46690fb7..0c99356db3 100644
--- a/cmake/QtApp.cmake
+++ b/cmake/QtApp.cmake
@@ -48,6 +48,11 @@ function(qt_internal_add_app target)
     # if CONFIG += console was encountered during conversion.
     set_target_properties("${target}" PROPERTIES WIN32_EXECUTABLE TRUE)
 
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.19.0" AND QT_FEATURE_debug_and_release)
+        set_property(TARGET "${target}"
+            PROPERTY EXCLUDE_FROM_ALL "$<NOT:$<CONFIG:${QT_MULTI_CONFIG_FIRST_CONFIG}>>")
+    endif()
+
     qt_add_list_file_finalizer(qt_internal_finalize_app ${target})
 endfunction()
 
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index c404a6b483..d44d3c9028 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -4975,6 +4975,11 @@ function(qt_add_tool target_name)
     qt_internal_add_target_aliases("${target_name}")
     _qt_internal_apply_strict_cpp("${target_name}")
 
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.19.0" AND QT_FEATURE_debug_and_release)
+        set_property(TARGET "${target_name}"
+            PROPERTY EXCLUDE_FROM_ALL "$<NOT:$<CONFIG:${QT_MULTI_CONFIG_FIRST_CONFIG}>>")
+    endif()
+
     if (NOT target_name STREQUAL name)
         set_target_properties(${target_name} PROPERTIES
             OUTPUT_NAME ${name}