Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/corelib/global/qlogging.cpp

Change-Id: I9cc8f25ad897efab6a42cb5c5161b1c9402952f0

1 files changed, 30 insertions, 18 deletions

diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index ad729fb915..b80e4e3758 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -491,6 +491,32 @@ static QString xcodeFiletypeForFilename(const QString &filename)
     return QString();
 }
 
+static bool compareProvisioningTeams(const QVariantMap &a, const QVariantMap &b)
+{
+    int aFree = a.value(QLatin1String("isFreeProvisioningTeam")).toBool() ? 1 : 0;
+    int bFree = b.value(QLatin1String("isFreeProvisioningTeam")).toBool() ? 1 : 0;
+    return aFree < bFree;
+}
+
+static QList<QVariantMap> provisioningTeams()
+{
+    const QSettings xcodeSettings(
+        QDir::homePath() + QLatin1String("/Library/Preferences/com.apple.dt.Xcode.plist"),
+        QSettings::NativeFormat);
+    const QVariantMap teamMap = xcodeSettings.value(QLatin1String("IDEProvisioningTeams")).toMap();
+    QList<QVariantMap> flatTeams;
+    for (QVariantMap::const_iterator it = teamMap.begin(), end = teamMap.end(); it != end; ++it) {
+        const QString emailAddress = it.key();
+        QVariantMap team = it.value().toMap();
+        team[QLatin1String("emailAddress")] = emailAddress;
+        flatTeams.append(team);
+    }
+
+    // Sort teams so that Free Provisioning teams come last
+    std::sort(flatTeams.begin(), flatTeams.end(), ::compareProvisioningTeams);
+    return flatTeams;
+}
+
 bool
 ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
 {
@@ -1405,25 +1431,11 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t)
 
         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();
+            const QList<QVariantMap> teams = provisioningTeams();
             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;
-                    }
-                }
+                // first suitable team we find is the one we'll use by default
+                settings.insert("DEVELOPMENT_TEAM",
+                    teams.first().value(QLatin1String("teamID")).toString());
             }
         }
         settings.insert("COPY_PHASE_STRIP", (as_release ? "YES" : "NO"));