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

5971b88e is not needed in new configure.

This merge also reverts "fix QMAKE_DEFAULT_*DIRS resolution with
apple SDK", 2c9d15d7, because it breaks iOS build with new
configure system.

Conflicts:
	mkspecs/features/default_pre.prf
	mkspecs/features/mac/toolchain.prf
	mkspecs/features/toolchain.prf
	src/dbus/qdbusconnection.cpp
	src/plugins/sqldrivers/mysql/qsql_mysql.cpp
	src/sql/drivers/mysql/qsql_mysql.cpp
	src/widgets/widgets/qmenubar.cpp
	src/widgets/widgets/qmenubar_p.h
	tools/configure/configureapp.cpp
	tools/configure/environment.cpp
	tools/configure/environment.h

Change-Id: I995533dd334211ebd25912db05b639d6f908aaec

1 files changed, 23 insertions, 0 deletions

diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index bf2e774678..ec69966c2a 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>
@@ -1403,6 +1404,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");