From cd1075459cf3a5fd864b745b0492ef4b5e10d572 Mon Sep 17 00:00:00 2001
From: Li Xinwei <1326710505@qq.com>
Date: Mon, 16 Nov 2020 13:56:31 +0800
Subject: [PATCH] CMake: Install missing debug info for some executable files

Although many executable files were generated by qt_internal_add_tool().
Some executable files like designer and androiddeployqt were generated
by qt_internal_add_app(). Some executable files like windeployqt were
generated by qt_internal_add_executable(). For these executable files,
their PDB files won't be installed on MSVC platform, and their separate
debug info won't be generated and installed on other platforms.

To fix this, qt_enable_separate_debug_info() and
qt_internal_install_pdb_files() should also be called in
qt_internal_add_executable().

Fixes: QTBUG-88268
Change-Id: Id6a3b5842dba325166e3d696701c82ad942bca74
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtExecutableHelpers.cmake | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cmake/QtExecutableHelpers.cmake b/cmake/QtExecutableHelpers.cmake
index 29793d24fc..db4cc06be2 100644
--- a/cmake/QtExecutableHelpers.cmake
+++ b/cmake/QtExecutableHelpers.cmake
@@ -163,6 +163,9 @@ function(qt_internal_add_executable name)
                        CONFIGURATIONS ${cmake_config}
                        ${install_targets_default_args})
         endforeach()
+
+        qt_enable_separate_debug_info(${name} "${arg_INSTALL_DIRECTORY}")
+        qt_internal_install_pdb_files(${name} "${arg_INSTALL_DIRECTORY}")
     endif()
 
     # If linking against Gui, make sure to also build the default QPA plugin.