From 4b0cb35b84011daa46cc60c4123562f431f179dc Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@qt.io>
Date: Fri, 10 Jun 2016 20:27:53 -0700
Subject: [PATCH] Fix installation of debug symbols on Apple platforms.

This follows up ab599a39313c22fd14cc5466cea5c61bbcdbba8e, which did not
take installation into account.

Task-number: QTBUG-54036
Change-Id: Ic1b3acb8984255dd1ca1c288b7b150814ce9e606
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 mkspecs/features/unix/separate_debug_info.prf | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf
index 460ad63e22..272cc8ef79 100644
--- a/mkspecs/features/unix/separate_debug_info.prf
+++ b/mkspecs/features/unix/separate_debug_info.prf
@@ -27,7 +27,12 @@ have_target:!static:if(darwin|!isEmpty(QMAKE_OBJCOPY)) {
             CONFIG += any_bundle
         }
 
-        debug_info_target_dir = $${debug_info_target}.$$debug_info_suffix/Contents/Resources/DWARF
+        debug_info_target_rel = $$section(debug_info_target, /, -1, -1)
+
+        debug_info_target_dir_suffix = .$$debug_info_suffix/Contents/Resources/DWARF
+
+        debug_info_target_dir = $${debug_info_target}$${debug_info_target_dir_suffix}
+        debug_info_target_dir_rel = $${debug_info_target_rel}$${debug_info_target_dir_suffix}
         !isEmpty(QMAKE_RESOLVED_BUNDLE): \
             QMAKE_TARGET_DEBUG_INFO = $$debug_info_target_dir/$$TARGET
         else: \
@@ -52,8 +57,23 @@ have_target:!static:if(darwin|!isEmpty(QMAKE_OBJCOPY)) {
             debug_info_plist.output = $${debug_info_target}.$$debug_info_suffix/Contents/Info.plist
             QMAKE_SUBSTITUTES += debug_info_plist
         }
+
+        contains(INSTALLS, target):isEmpty(target.files):isEmpty(target.commands):isEmpty(target.extra) {
+            !build_pass|release {
+                debug_info_plist_target.CONFIG += no_check_exist
+                debug_info_plist_target.files = $${debug_info_target}.$$debug_info_suffix/Contents/Info.plist
+                debug_info_plist_target.path += $${target.path}/$${debug_info_target_rel}.$$debug_info_suffix/Contents
+                INSTALLS += debug_info_plist_target
+            }
+
+            debug_info_target.CONFIG += no_check_exist
+            debug_info_target.files = $$QMAKE_TARGET_DEBUG_INFO
+            debug_info_target.path += $${target.path}/$${debug_info_target_dir_rel}
+            INSTALLS += debug_info_target
+        }
     } else {
         QMAKE_TARGET_DEBUG_INFO = $${QMAKE_RESOLVED_TARGET}.$$debug_info_suffix
+        target.targets += $$QMAKE_TARGET_DEBUG_INFO
     }
 
     shell_target = $$shell_quote($$relative_path($$QMAKE_RESOLVED_TARGET, $$OUT_PWD))
@@ -72,6 +92,5 @@ have_target:!static:if(darwin|!isEmpty(QMAKE_OBJCOPY)) {
     }
     silent:QMAKE_POST_LINK = @echo creating $@.$$debug_info_suffix && $$QMAKE_POST_LINK
 
-    target.targets += $$QMAKE_TARGET_DEBUG_INFO
     QMAKE_DISTCLEAN += $$QMAKE_TARGET_DEBUG_INFO
 }