diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-20 08:44:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-20 09:00:44 +0100 |
| commit | ae2695535a2f1abbd4c6596a22dd33319b9388dd (patch) | |
| tree | 91df41df365a13ea71b1361d909535e5b7a7360a /qmake/generators | |
| parent | 8066ae49433ed7604e710eef7b15d15de171608e (diff) | |
| parent | c1a2f97a3b3a8c058b1760b57e5c83bf7815b84a (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qfilesystemengine_win.cpp
src/gui/text/qdistancefield.cpp
src/plugins/platforms/xcb/qxcbconnection.h
Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 17 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 7 |
2 files changed, 18 insertions, 6 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 728e654be8..7507b26c09 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1477,13 +1477,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")); 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) diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 60734b4d1b..34975f2b7b 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -1153,7 +1153,12 @@ bool VCCLCompilerTool::parseOption(const char* option) } found = false; break; case 'u': - UndefineAllPreprocessorDefinitions = _True; + if (!second) + UndefineAllPreprocessorDefinitions = _True; + else if (second == 't' && third == 'f' && fourth == '8') + AdditionalOptions += option; + else + found = false; break; case 'v': if(second == 'd' || second == 'm') { |