Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: Ia082e20e2eb4b76afd4c1a1584ff4e5514655d7a

1 files changed, 11 insertions, 1 deletions

diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 3b1f904253..18b62c5135 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -1603,7 +1603,17 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
                     }
                 }
 
-                t << "\t\t\t\t" << writeSettings("SYMROOT", Option::output_dir) << ";\n";
+                // The symroot is marked by xcodebuild as excluded from Time Machine
+                // backups, as it's a temporary build dir, so we don't want it to be
+                // the same as the possibe in-source dir, as that would leave out
+                // sources from being backed up.
+                t << "\t\t\t\t" << writeSettings("SYMROOT",
+                    Option::output_dir + Option::dir_sep + ".xcode") << ";\n";
+
+                // The configuration build dir however is not treated as excluded,
+                // so we can safely point it to the root output dir.
+                t << "\t\t\t\t" << writeSettings("CONFIGURATION_BUILD_DIR",
+                    Option::output_dir + Option::dir_sep + "$(CONFIGURATION)") << ";\n";
 
                 if (!project->isEmpty("DESTDIR")) {
                     ProString dir = project->first("DESTDIR");