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

Conflicts:
	mkspecs/features/mac/default_post.prf
	mkspecs/features/uikit/default_post.prf

Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218

4 files changed, 27 insertions, 5 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 5d7700ec82..4450e619b9 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2623,8 +2623,8 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
         for (ProStringList::ConstIterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
             QString dep = var(ProKey(*dep_it + ".target"));
             if(dep.isEmpty())
-                dep = Option::fixPathToTargetOS((*dep_it).toQString(), false);
-            deps += ' ' + escapeDependencyPath(dep);
+                dep = (*dep_it).toQString();
+            deps += ' ' + escapeDependencyPath(Option::fixPathToTargetOS(dep, false));
         }
         if (config.indexOf("recursive") != -1) {
             QSet<QString> recurse;
@@ -2690,7 +2690,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
         }
         if (config.indexOf("phony") != -1)
             deps += " FORCE";
-        t << targ << ":" << deps << "\n";
+        t << escapeDependencyPath(Option::fixPathToTargetOS(targ, false)) << ":" << deps << "\n";
         if(!cmd.isEmpty())
             t << "\t" << cmd << endl;
     }
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 4539058cbf..914505a362 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -1158,6 +1158,21 @@ static inline QString toString(subSystemOption option)
     return QString();
 }
 
+static inline QString toString(triState genDebugInfo, linkerDebugOption option)
+{
+    switch (genDebugInfo) {
+    case unset:
+        break;
+    case _False:
+        return "false";
+    case _True:
+        if (option == linkerDebugOptionFastLink)
+            return "DebugFastLink";
+        return "true";
+    }
+    return QString();
+}
+
 static inline QString toString(machineTypeOption option)
 {
     switch (option) {
@@ -1536,7 +1551,7 @@ void VCXProjectWriter::write(XmlOutput &xml, const VCLinkerTool &tool)
             << attrTagS(_EntryPointSymbol, tool.EntryPointSymbol)
             << attrTagX(_ForceSymbolReferences, tool.ForceSymbolReferences, ";")
             << attrTagS(_FunctionOrder, tool.FunctionOrder)
-            << attrTagT(_GenerateDebugInformation, tool.GenerateDebugInformation)
+            << attrTagS(_GenerateDebugInformation, toString(tool.GenerateDebugInformation, tool.DebugInfoOption))
             << attrTagT(_GenerateManifest, tool.GenerateManifest)
             << attrTagT(_GenerateWindowsMetadata, tool.GenerateWindowsMetadata)
             << attrTagS(_WindowsMetadataFile, tool.GenerateWindowsMetadata == _True ? tool.WindowsMetadataFile : QString())
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 219b889706..f219130e18 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -1454,8 +1454,10 @@ bool VCLinkerTool::parseOption(const char* option)
         }else
             EnableUAC = _True;
         break;
-    case 0x3389797: // /DEBUG
+    case 0x3389797: // /DEBUG[:FASTLINK]
         GenerateDebugInformation = _True;
+        if (config->CompilerVersion >= NET2015 && strcmp(option + 7, "FASTLINK") == 0)
+            DebugInfoOption = linkerDebugOptionFastLink;
         break;
     case 0x0033896: // /DEF:filename
         ModuleDefinitionFile = option+5;
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 64c6e9098d..35bc3913a8 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -278,6 +278,10 @@ enum inlineExpansionOption {
     expandAnySuitable,
     expandDefault // Not useful number, but stops the output
 };
+enum linkerDebugOption {
+    linkerDebugOptionNone,
+    linkerDebugOptionFastLink
+};
 enum linkIncrementalType {
     linkIncrementalDefault,
     linkIncrementalNo,
@@ -591,6 +595,7 @@ public:
     QStringList             ForceSymbolReferences;
     QString                 FunctionOrder;
     triState                GenerateDebugInformation;
+    linkerDebugOption       DebugInfoOption;
     triState                GenerateMapFile;
     qlonglong               HeapCommitSize;
     qlonglong               HeapReserveSize;