diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2017-03-10 15:39:59 +0100 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2017-12-06 06:00:04 +0000 |
| commit | b63be08367fb7fbd1eb7b48d0ab3d584ff1bcea1 (patch) | |
| tree | 2b23e50a2b543eb12aae98736ac38a937aa33746 | |
| parent | 3abb63c4827fadc5935b64ec9739fa110ebec5d3 (diff) | |
Add QMake variables for development team and provisioning profile
Adding both development team and provisioning profile to Xcode
switches off the automatic signing
Task-number: QTBUG-64477
Task-number: QTBUG-38782
Change-Id: Ic869e16490c11e369b6674c815e860cac66c5afa
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
(cherry picked from commit f06f1adb6cc3835793a15eafa2d5a3affad712a2)
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 59e7991d4c..2d8765e3d0 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1433,13 +1433,20 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) QMap<QString, QString> settings; if (!project->isActiveConfig("no_xcode_development_team")) { - const QList<QVariantMap> teams = provisioningTeams(); - if (!teams.isEmpty()) { - // first suitable team we find is the one we'll use by default - settings.insert("DEVELOPMENT_TEAM", - teams.first().value(QLatin1String("teamID")).toString()); + QString teamId; + if (!project->isEmpty("QMAKE_DEVELOPMENT_TEAM")) { + teamId = project->first("QMAKE_DEVELOPMENT_TEAM").toQString(); + } else { + 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")); // Bitcode is only supported with a deployment target >= iOS 6.0. // Disable it for now, and consider switching it on when later |