3 files changed, 20 insertions, 2 deletions
diff --git a/mkspecs/features/qpa/basicunixfontdatabase.prf b/mkspecs/features/qpa/basicunixfontdatabase.prf
index 261eadb5d0..f2e4016c99 100644
--- a/mkspecs/features/qpa/basicunixfontdatabase.prf
+++ b/mkspecs/features/qpa/basicunixfontdatabase.prf
@@ -1,3 +1,3 @@
 contains(QT_CONFIG, system-freetype) {
-    LIBS += -lfreetype
+    LIBS_PRIVATE += -lfreetype
 }
diff --git a/mkspecs/features/qpa/genericunixfontdatabase.prf b/mkspecs/features/qpa/genericunixfontdatabase.prf
index fc11bea470..b0d81e5571 100644
--- a/mkspecs/features/qpa/genericunixfontdatabase.prf
+++ b/mkspecs/features/qpa/genericunixfontdatabase.prf
@@ -1,7 +1,7 @@
 CONFIG += qpa/basicunixfontdatabase
 contains(QT_CONFIG, fontconfig) {
     DEFINES += Q_FONTCONFIGDATABASE
-    LIBS += -lfontconfig
+    LIBS_PRIVATE += -lfontconfig
 } else:!android {
     fonts.path = $$[QT_INSTALL_LIBS]/fonts
     fonts.files = $$QT_SOURCE_TREE/lib/fonts/*
diff --git a/mkspecs/features/win32/separate_debug_info.prf b/mkspecs/features/win32/separate_debug_info.prf
new file mode 100644
index 0000000000..2838020f01
--- /dev/null
+++ b/mkspecs/features/win32/separate_debug_info.prf
@@ -0,0 +1,18 @@
+have_target:!static:!isEmpty(QMAKE_OBJCOPY) {
+    load(resolve_target)
+    QMAKE_TARGET_DEBUG_INFO = $${QMAKE_RESOLVED_TARGET}.debug
+
+    shell_target = $$shell_quote($$relative_path($$QMAKE_RESOLVED_TARGET, $$OUT_PWD))
+    shell_target_debug_info = $$shell_quote($$relative_path($$QMAKE_TARGET_DEBUG_INFO, $$OUT_PWD))
+    copy_debug_info = $$QMAKE_OBJCOPY --only-keep-debug $$shell_target $$shell_target_debug_info
+    link_debug_info = $$QMAKE_OBJCOPY --add-gnu-debuglink=$$shell_target_debug_info $$shell_target
+    strip_debug_info = $$QMAKE_OBJCOPY --strip-debug $$shell_target
+
+    !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK
+
+    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
+    QMAKE_DISTCLEAN += $$QMAKE_TARGET_DEBUG_INFO
+}