summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2018-06-05 16:29:06 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2018-10-16 08:37:05 +0000
commit81b29a44d248b5037a2f05dd8815e000d9472f0e (patch)
tree49328a67747aba48f2b7a9ca771600f66e93616e
parenta5978909a863661d667bbcd2764722b8b78b759f (diff)
Opt out of new Xcode build system until we can handle its requirementsv5.9.7
The new build system in Xcode 10 requires outputs from shell script to be explicitly declared if they are used by subsequent build phases, otherwise the build system may attempt to search for the file before it has been generated, causing the build to fail. The build phase we use for Qt preprocessing (moc, rcc, etc), does not list these output files, so we need to disable the new build system for now. Task-number: QTBUG-71088 Change-Id: I7404c19021f57489e985bd1203ad09ce9b83b090 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 21e9c7c24f6430fc694e4ec0d34fba64427587dc) Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r--mkspecs/macx-xcode/WorkspaceSettings.xcsettings2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/macx-xcode/WorkspaceSettings.xcsettings b/mkspecs/macx-xcode/WorkspaceSettings.xcsettings
index 08de0be8d3..a3f43a8b38 100644
--- a/mkspecs/macx-xcode/WorkspaceSettings.xcsettings
+++ b/mkspecs/macx-xcode/WorkspaceSettings.xcsettings
@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>BuildSystemType</key>
+ <string>Original</string>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<false/>
</dict>