diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-21 11:41:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-06-21 11:41:09 +0000 |
| commit | ba75a16b419bba1f48480d6b6ff0d13da0805fea (patch) | |
| tree | 5cee2691720a5a71a3befbb7ce9944aefed23202 /qmake | |
| parent | 60e56f1679d69b3e7217fa77a1e2d69250ac049d (diff) | |
| parent | 8eabb44f8a3f5c22aed44fbd3e1919cc7e04b1a5 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into refs/staging/5.11
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 18b62c5135..80891e682f 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1613,7 +1613,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"); |