diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 320ebd0f8dcbebf71ec7d7c0adba97f83e68cafc..08e0b7822b88b6289f6a1be3983e5472fad1bbb5 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -21,6 +21,4 @@ CONFIG -= bsymbolic_functions
 
 contains(QT_CONFIG, egl): CONFIG += egl
 
-linux {
-    CONFIG(release, debug|release) | contains(QT_CONFIG, separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)"
-}
+linux: contains(QT_CONFIG, separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)"
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index ed592e1fdd5187d1504b564844fb287a0bbed777..244ce7ec05ba019b2a7b6a6655bd9c9103c22e27 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -23,6 +23,11 @@ GYP_CONFIG += disable_glibcxx_debug=1
 
 linux:contains(QT_CONFIG, separate_debug_info): GYP_CONFIG += linux_dump_symbols=1
 
+force_debug_info {
+    win32: GYP_CONFIG += win_release_extra_cflags=-Zi
+    else: GYP_CONFIG += release_extra_cflags=-g
+}
+
 # Append additional platform options defined in GYP_CONFIG
 for (config, GYP_CONFIG): GYP_ARGS += "-D $$config"