1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add QMake variables for development team and provisioning profile

Browse Source 
Adding both development team and provisioning profile to Xcode
switches off the automatic signing

Task-number: QTBUG-38782
Change-Id: Ic869e16490c11e369b6674c815e860cac66c5afa
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Vikas Pachdha 2017-03-10 15:39:59 +01:00
parent 75f5e2bef2
commit f06f1adb6c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -1477,13 +1477,20 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
QMap<QString, QString> settings; QMap<QString, QString> settings;
if (!project->isActiveConfig("no_xcode_development_team")) { if (!project->isActiveConfig("no_xcode_development_team")) {
const QList<QVariantMap> teams = provisioningTeams(); QString teamId;
if (!teams.isEmpty()) { if (!project->isEmpty("QMAKE_DEVELOPMENT_TEAM")) {
// first suitable team we find is the one we'll use by default teamId = project->first("QMAKE_DEVELOPMENT_TEAM").toQString();
settings.insert("DEVELOPMENT_TEAM", } else {
teams.first().value(QLatin1String("teamID")).toString()); const QList<QVariantMap> teams = provisioningTeams();
if (!teams.isEmpty()) // first suitable team we find is the one we'll use by default
teamId = teams.first().value(QLatin1String("teamID")).toString();
} }
if (!teamId.isEmpty())
settings.insert("DEVELOPMENT_TEAM", teamId);
if (!project->isEmpty("QMAKE_PROVISIONING_PROFILE"))
settings.insert("PROVISIONING_PROFILE_SPECIFIER", project->first("QMAKE_PROVISIONING_PROFILE").toQString());
} }
settings.insert("COPY_PHASE_STRIP", (as_release ? "YES" : "NO")); settings.insert("COPY_PHASE_STRIP", (as_release ? "YES" : "NO"));
settings.insert("APPLICATION_EXTENSION_API_ONLY", project->isActiveConfig("app_extension_api_only") ? "YES" : "NO"); settings.insert("APPLICATION_EXTENSION_API_ONLY", project->isActiveConfig("app_extension_api_only") ? "YES" : "NO");
// required for tvOS (and watchos), optional on iOS (deployment target >= iOS 6.0) // required for tvOS (and watchos), optional on iOS (deployment target >= iOS 6.0)