summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-03-19 13:42:50 +0100
committerMichal Klocek <michal.klocek@qt.io>2020-05-14 19:05:11 +0000
commit51d0f66306ea5bcac6e47e0845a0dd340fc76a6e (patch)
treeee55d4c5b6d16701acafb93f702d28e7f685fefb /src/core
parent9202da6fac5c9f818ba8c70f3902cc03f6bc1d16 (diff)
Fix conflict warning when running qmake on gn_run
Since e75aed1a96e in base we have now new check for conflicting 'targets' when doing debug_and_release builds and generates a warning: Targets of builds 'Release' and 'Debug' conflict: gn_run. Some people are unhappy about it (me), therefore make workaround to suppress this warning. Most likely there is better way to fix it. Change-Id: Ia9dd3e2418c49097acf52ae3a0a6deae57365999 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/gn_run.pro5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
index 8b16d7c59..f3d57dad1 100644
--- a/src/core/gn_run.pro
+++ b/src/core/gn_run.pro
@@ -65,3 +65,8 @@ build_pass|!debug_and_release {
notParallel.target = .NOTPARALLEL
QMAKE_EXTRA_TARGETS += notParallel
}
+
+build_pass:CONFIG(debug, debug|release) {
+ TARGET = gn_run_debug
+}
+