summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2016-06-27 13:41:02 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2016-06-27 12:37:17 +0000
commite4d555219bb95732280eb42fb1e8d77da4ab8b96 (patch)
tree1c65704740cff9017cf9ae92fa01146f1afca6d7 /src
parent722732d1f089630ad517aef8f94325a51186b274 (diff)
Stop linking both debug and release libraries at the same time.
Change-Id: Ide3a8adc320b38a399514c0115bd8e24c37af63d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/core/core_module.pro7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 62ef71eab..559fbe484 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -114,6 +114,13 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat
}
}
+!win32:!build_pass:debug_and_release {
+ # Special GNU make target that ensures linking isn't done for both debug and release builds
+ # at the same time.
+ notParallel.target = .NOTPARALLEL
+ QMAKE_EXTRA_TARGETS += notParallel
+}
+
OTHER_FILES = \
$$files(../3rdparty/chromium/*.h, true) \
$$files(../3rdparty/chromium/*.cc, true) \