Merge remote-tracking branch 'origin/5.9.6' into 5.9

Change-Id: I5364773559d785e3807f6152d69e29484a0e2f37

2 files changed, 47 insertions, 1 deletions

diff --git a/dist/changes-5.9.6 b/dist/changes-5.9.6
new file mode 100644
index 0000000000..29f5ec2d57
--- /dev/null
+++ b/dist/changes-5.9.6
@@ -0,0 +1,46 @@
+Qt 5.9.6 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0 through 5.9.5.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                              Qt 5.9.6 Changes                            *
+****************************************************************************
+
+ - This release contains only minor code improvements.
+
+QtCore
+------
+
+ - [QTBUG-61159] Fixed QStandardPaths::standardLocations() returning some
+   incorrect paths on macOS.
+ - [QTBUG-57299] Fixed some issues with locking files during save using
+   QSaveFile if the target directory is monitored by Dropbox.
+
+QtWidgets
+---------
+
+ - [QTBUG-16252] Fixed geometry not restored correctly for a dock widget
+   after being docked.
+
+qmake
+-----
+
+ - [QTBUG-52474][Xcode] Fixed sources being excluded from Time Machine
+   backups.
+ - [QTBUG-66156] $$relative_path() and $$absolute_path() now resolve
+   the base directory to an absolute path.
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 6ef60e97b2..a777e001b2 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -1612,7 +1612,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
                 // 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";
+                    Option::output_dir + Option::dir_sep + "$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)") << ";\n";
 
                 if (!project->isEmpty("DESTDIR")) {
                     ProString dir = project->first("DESTDIR");