diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
commit | 06bd93c4acf49fc24408a60ebdf7a46caf02f9b3 (patch) | |
tree | eedbdaa40fbf20bb99187084dd9edf14f73f05bd /qmake/generators/mac/pbuilder_pbx.cpp | |
parent | bafad505a0adb21b819f7617e5e802bf2d52fd54 (diff) | |
parent | 41a7d74385eece725435159ca021151e871bf116 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/platforms/ios/qiosmessagedialog.mm
Change-Id: Icfbf55c3215ec088e552d0b42a5c94d04b17c65f
Diffstat (limited to 'qmake/generators/mac/pbuilder_pbx.cpp')
-rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 51c39a66d9..c0f968e335 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -33,6 +33,7 @@ #include <qregexp.h> #include <qcryptographichash.h> #include <qdebug.h> +#include <qsettings.h> #include <qstring.h> #include <stdlib.h> #include <time.h> @@ -1449,6 +1450,28 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) QString configName = (as_release ? "Release" : "Debug"); QMap<QString, QString> settings; + if (!project->isActiveConfig("no_xcode_development_team")) { + const QSettings xcodeSettings( + QDir::homePath() + QLatin1String("/Library/Preferences/com.apple.dt.Xcode.plist"), + QSettings::NativeFormat); + const QVariantMap teams = xcodeSettings.value(QLatin1String("IDEProvisioningTeams")).toMap(); + if (!teams.isEmpty()) { + for (QVariantMap::const_iterator it = teams.begin(), end = teams.end(); it != end; ++it) { + const QVariantMap team = it.value().toMap(); + const QString teamType = team.value(QLatin1String("teamType")).toString(); + + // Skip Company teams because signing permissions may not be available under all + // circumstances for users who are not the Team Agent + if (teamType != QLatin1String("Company")) { + const QString teamId = team.value(QLatin1String("teamID")).toString(); + settings.insert("DEVELOPMENT_TEAM", teamId); + + // first suitable team we found is the one we'll use by default + break; + } + } + } + } settings.insert("COPY_PHASE_STRIP", (as_release ? "YES" : "NO")); // required for tvOS (and watchos), optional on iOS (deployment target >= iOS 6.0) settings.insert("ENABLE_BITCODE", project->isActiveConfig("bitcode") ? "YES" : "NO"); |