diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-06-06 12:44:18 +0200 |
---|---|---|
committer | Akseli Salovaara <akseli.salovaara@qt.io> | 2018-06-06 21:28:10 +0000 |
commit | 9c50112304033c631e52f062496f3111f24835a2 (patch) | |
tree | 871383e7b8bf8e866d03889b0a69ab8944e08ccc /qmake/generators/mac/pbuilder_pbx.cpp | |
parent | 4e68ad5f120f9c883ad5fde5a68278ba3b01e8e3 (diff) | |
download | qtbase-5.9.6.tar.gz |
The default value for CONFIGURATION_BUILD_DIR includes EFFECTIVE_PLATFORM_NAME,
but when overriding it in 554e44b77 we only used the CONFIGURATION variable.
This left the .app in iOS builds in Debug instead of Debug-iphoneos,
breaking deployment from within Qt Creator, which had this directory
hard-coded.
We now include EFFECTIVE_PLATFORM_NAME to restore the original
destination for the .app bundle.
Task-number: QTBUG-68705
Change-Id: If304193d3e351e19fb84d250a62ae331af6966c6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
(cherry picked from commit 689a071e843dfbac49901018ba3c49b08e22fd94)
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'qmake/generators/mac/pbuilder_pbx.cpp')
-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 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"); |