summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@theqtcompany.com>2016-02-23 08:43:33 -0800
committerJake Petroules <jake.petroules@theqtcompany.com>2016-02-25 01:16:48 +0000
commitc5001b9db3906bf2390053798a84489f6f901a4d (patch)
tree1644dc7f078ca555baf3fecbd38561479aaf97a6 /mkspecs
parentb6f84ea2aa13b22ceb2a2f2c12d7a9d9c86742c0 (diff)
qmake: Fix unwanted concurrency in simulator_and_device builds.
Change-Id: Ia73fe903e5157fb1262878ede1fb1cc1af1c80f4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_module.prf4
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index e543ea65e6..bee12dea34 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -117,7 +117,9 @@ lib_bundle {
QMAKE_INFO_PLIST = $$QMAKESPEC/Info.plist.lib
}
CONFIG -= qt_install_headers #no need to install these as well
- !debug_and_release|!build_all|CONFIG(release, debug|release) {
+ !build_all| \
+ if(if(!debug_and_release|CONFIG(release, debug|release)): \
+ if(!simulator_and_device|CONFIG(device, simulator|device))) {
FRAMEWORK_HEADERS.version = Versions
FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
FRAMEWORK_HEADERS.path = Headers