From 259b31566013b078d7658115eddae61514594946 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 20 Mar 2018 14:11:48 +0100
Subject: [PATCH] Move the last gn_arg over to the rest
is_debug was the only configuration argument still set in gn_run.pro
Change-Id: I7b66888e6b936b44bafdad02f7974941d4e875ce
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
src/core/config/common.pri | 2 ++
src/core/gn_run.pro | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/core/config/common.pri b/src/core/config/common.pri
index 9a9c6bc6f..edc77d83d 100644
--- a/src/core/config/common.pri
+++ b/src/core/config/common.pri
@@ -55,6 +55,7 @@ precompile_header {
}
CONFIG(release, debug|release) {
+ gn_args += is_debug=false
force_debug_info {
# Level 1 is not enough to generate all Chromium debug symbols on Windows
msvc: gn_args += symbol_level=2
@@ -65,6 +66,7 @@ CONFIG(release, debug|release) {
}
CONFIG(debug, debug|release) {
+ gn_args += is_debug=true
gn_args += use_debug_fission=false
}
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
index 384eaca37..c8c503a39 100644
--- a/src/core/gn_run.pro
+++ b/src/core/gn_run.pro
@@ -29,10 +29,6 @@ build_pass|!debug_and_release {
gn_args = $$gnArgs()
- CONFIG(release, debug|release) {
- gn_args += is_debug=false
- }
-
gn_args += "qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\""
!qtConfig(webengine-system-gn) {
--
GitLab