From 3188a0d9976a02f76c0a8d6d91e77bb1d2e131c8 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Thu, 18 Sep 2014 12:22:37 +0200
Subject: [PATCH] QtWebEngine should join the Beautiful Stack Trace Club
Configuring Qt with -force-debug-info -no-strip should carry the
needed cflags to ninja through gyp.
Also prevent stripping the library in release with force_debug_info.
qmake will already call strip --strip-unneeded by default when
running make install for release builds so remove that condition
completely from core_module.pro.
Change-Id: Ic31fca5b4365d61161f2500c2de011faa3e19c14
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
src/core/core_module.pro | 4 +---
src/core/gyp_run.pro | 5 +++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 320ebd0f8..08e0b7822 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 ed592e1fd..244ce7ec0 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"
--
GitLab