summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2022-06-20 14:58:12 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-20 23:19:24 +0000
commita73459b8cbd9a0cf098a2a5cac4579b31cb17720 (patch)
tree5a379529aeb5fd62a7e1c5ed389e694956764d19
parentc0aa21734dde2bdfff2adc4d735de918530c58ae (diff)
qmake/MinGW: Install separate debug info of DLLs next to the DLL
...instead of next to the import library. If separate_debug_info is enabled then we would create an install rule that puts the .dll.debug file next to the .a file. GDB however expects the file to be next to the .dll. Fix the installation rule in separate_debug_info.prf accordingly. This affects the MinGW packages of Qt 5.15 and user projects targeting MinGW. Fixes: QTBUG-86790 Change-Id: If91c356e7e7f7f4330ebc43691e414929f9beb4b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit fc2e40e88d44d457ec5ebd1cc235696f3f478be9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--mkspecs/features/win32/separate_debug_info.prf6
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/win32/separate_debug_info.prf b/mkspecs/features/win32/separate_debug_info.prf
index 2838020f01..181ae5219b 100644
--- a/mkspecs/features/win32/separate_debug_info.prf
+++ b/mkspecs/features/win32/separate_debug_info.prf
@@ -13,6 +13,10 @@ have_target:!static:!isEmpty(QMAKE_OBJCOPY) {
QMAKE_POST_LINK = $$copy_debug_info && $$strip_debug_info && $$link_debug_info $$QMAKE_POST_LINK
silent:QMAKE_POST_LINK = @echo creating $@.debug && $$QMAKE_POST_LINK
- target.targets += $$QMAKE_TARGET_DEBUG_INFO
+ contains(TEMPLATE, lib$) {
+ dlltarget.targets += $$QMAKE_TARGET_DEBUG_INFO
+ } else {
+ target.targets += $$QMAKE_TARGET_DEBUG_INFO
+ }
QMAKE_DISTCLEAN += $$QMAKE_TARGET_DEBUG_INFO
}