Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensource

Change-Id: I976ce0c3664c9953dd0019b7d76d3f603583634f

8 files changed, 106 insertions, 33 deletions

diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index a9d0125825..7820739b06 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -2061,4 +2061,10 @@ ProjectBuilderMakefileGenerator::writeSettings(const QString &var, const ProStri
     return ret;
 }
 
+bool
+ProjectBuilderMakefileGenerator::inhibitMakeDirOutPath(const ProKey &path) const
+{
+    return path == "OBJECTS_DIR";
+}
+
 QT_END_NAMESPACE
diff --git a/qmake/generators/mac/pbuilder_pbx.h b/qmake/generators/mac/pbuilder_pbx.h
index 1b90a3bbeb..fcf6b0557a 100644
--- a/qmake/generators/mac/pbuilder_pbx.h
+++ b/qmake/generators/mac/pbuilder_pbx.h
@@ -68,6 +68,7 @@ public:
 protected:
     bool doPrecompiledHeaders() const override { return false; }
     bool doDepends() const override { return writingUnixMakefileGenerator && UnixMakefileGenerator::doDepends(); }
+    bool inhibitMakeDirOutPath(const ProKey &path) const override;
 };
 QT_END_NAMESPACE
 
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index dfbbde3b26..7ff921549d 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -173,6 +173,9 @@ MakefileGenerator::initOutPaths()
         if (noIO() || (project->first("TEMPLATE") == "subdirs"))
             continue;
 
+        if (inhibitMakeDirOutPath(dkey))
+            continue;
+
         QString path = project->first(dkey).toQString(); //not to be changed any further
         path = fileFixify(path, FileFixifyBackwards);
         debug_msg(3, "Fixed output_dir %s (%s) into %s", dirs[x],
@@ -216,6 +219,18 @@ MakefileGenerator::initOutPaths()
     }
 }
 
+/*
+ * For the given directory path, return true if MakefileGenerator::initOutPaths() should inhibit the
+ * creation of the directory. Overload this in subclasses.
+ */
+bool
+MakefileGenerator::inhibitMakeDirOutPath(const ProKey &path) const
+{
+    Q_UNUSED(path);
+    return false;
+}
+
+
 QMakeProject
 *MakefileGenerator::projectFile() const
 {
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 0ea587f607..106069c454 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -153,6 +153,7 @@ protected:
     void verifyCompilers();
     virtual void init();
     void initOutPaths();
+    virtual bool inhibitMakeDirOutPath(const ProKey &path) const;
     struct Compiler
     {
         QString variable_in;
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 355260c974..3ee4a260c0 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -144,6 +144,7 @@ const char _IntermediateDirectory[]             = "IntermediateDirectory";
 const char _KeyContainer[]                      = "KeyContainer";
 const char _KeyFile[]                           = "KeyFile";
 const char _LanguageStandard[]                  = "LanguageStandard";
+const char _LanguageStandard_C[]                = "LanguageStandard_C";
 const char _LargeAddressAware[]                 = "LargeAddressAware";
 const char _LinkDLL[]                           = "LinkDLL";
 const char _LinkErrorReporting[]                = "LinkErrorReporting";
@@ -1483,6 +1484,7 @@ void VCXProjectWriter::write(XmlOutput &xml, const VCCLCompilerTool &tool)
             << attrTagT(_MinimalRebuild, tool.MinimalRebuild)
             << attrTagT(_MultiProcessorCompilation, tool.MultiProcessorCompilation)
             << attrTagS(_LanguageStandard, tool.LanguageStandard)
+            << attrTagS(_LanguageStandard_C, tool.LanguageStandard_C)
             << attrTagS(_ObjectFileName, tool.ObjectFile)
             << attrTagT(_OmitDefaultLibName, tool.OmitDefaultLibName)
             << attrTagT(_OmitFramePointers, tool.OmitFramePointers)
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 1b36feb67e..6dca363b76 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -40,36 +40,40 @@ using namespace QMakeInternal;
 
 QT_BEGIN_NAMESPACE
 
-static DotNET vsVersionFromString(const char *versionString)
+DotNET vsVersionFromString(const ProString &versionString)
 {
-    struct VSVersionMapping
-    {
-        const char *str;
-        DotNET version;
-    };
-    static VSVersionMapping mapping[] = {
-        { "7.0", NET2002 },
-        { "7.1", NET2003 },
-        { "8.0", NET2005 },
-        { "9.0", NET2008 },
-        { "10.0", NET2010 },
-        { "11.0", NET2012 },
-        { "12.0", NET2013 },
-        { "14.0", NET2015 },
-        { "15.0", NET2017 },
-        { "16.0", NET2019 }
-    };
-    DotNET result = NETUnknown;
-    for (const auto entry : mapping) {
-        if (strcmp(entry.str, versionString) == 0)
-            return entry.version;
+    int idx = versionString.indexOf(QLatin1Char('.'));
+    if (idx == -1)
+        return NETUnknown;
+
+    QStringView versionView = versionString.toQStringView();
+    int versionMajor = versionView.left(idx).toInt();
+    int versionMinor = versionView.mid(idx + 1).toInt();
+
+    if (versionMajor == 16)
+        return NET2019;
+    if (versionMajor == 15)
+        return NET2017;
+    if (versionMajor == 14)
+        return NET2015;
+    if (versionMajor == 12)
+        return NET2013;
+    if (versionMajor == 11)
+        return NET2012;
+    if (versionMajor == 10)
+        return NET2010;
+    if (versionMajor == 9)
+        return NET2008;
+    if (versionMajor == 8)
+        return NET2005;
+    if (versionMajor == 7) {
+        if (versionMinor == 0)
+            return NET2002;
+        if (versionMinor == 1)
+            return NET2003;
     }
-    return result;
-}
 
-DotNET vsVersionFromString(const ProString &versionString)
-{
-    return vsVersionFromString(versionString.toLatin1().constData());
+    return NETUnknown;
 }
 
 // XML Tags ---------------------------------------------------------
@@ -1147,12 +1151,39 @@ bool VCCLCompilerTool::parseOption(const char* option)
             ShowIncludes = _True;
             break;
         }
-        if (strlen(option) > 8 && second == 't' && third == 'd') {
-            const QString version = option + 8;
-            static const QStringList knownVersions = { "14", "17", "latest" };
-            if (knownVersions.contains(version)) {
-                LanguageStandard = "stdcpp" + version;
-                break;
+        if (strlen(option) > 7 && second == 't' && third == 'd' && fourth == ':') {
+            static const QRegExp rex("(c(?:\\+\\+)?)(.+)");
+            if (rex.exactMatch(option + 5)) {
+                QString *var = nullptr;
+                const QStringList *knownVersions = nullptr;
+                QString valuePrefix;
+                auto lang = rex.cap(1);
+                auto version = rex.cap(2);
+                if (lang == QStringLiteral("c++")) {
+                    // Turn /std:c++17 into <LanguageStandard>stdcpp17</LanguageStandard>
+                    static const QStringList knownCxxVersions = {
+                        "14",
+                        "17",
+                        "20",
+                        "latest"
+                    };
+                    var = &LanguageStandard;
+                    knownVersions = &knownCxxVersions;
+                    valuePrefix = "stdcpp";
+                } else if (lang == QStringLiteral("c")) {
+                    // Turn /std:c17 into <LanguageStandard_C>stdc17</LanguageStandard_C>
+                    static const QStringList knownCVersions = {
+                        "11",
+                        "17"
+                    };
+                    var = &LanguageStandard_C;
+                    knownVersions = &knownCVersions;
+                    valuePrefix = "stdc";
+                }
+                if (var && knownVersions->contains(version)) {
+                    *var = valuePrefix + version;
+                    break;
+                }
             }
         }
         found = false; break;
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 33eff0d914..f4d49b1197 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -527,6 +527,7 @@ public:
     inlineExpansionOption   InlineFunctionExpansion;
     triState                KeepComments;
     QString                 LanguageStandard;
+    QString                 LanguageStandard_C;
     triState                MinimalRebuild;
     QString                 ObjectFile;
     triState                OmitDefaultLibName;
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index c830ae62f4..a8680cf5bd 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -37,6 +37,7 @@
 #include <qcryptographichash.h>
 #include <qhash.h>
 #include <quuid.h>
+#include <qregexp.h>
 
 #include <stdlib.h>
 
@@ -1052,6 +1053,20 @@ void VcprojGenerator::initConfiguration()
     initPreLinkEventTools();
 }
 
+// Filter from the given QMAKE_CFLAGS the options that are relevant
+// for the vcxproj-global VCCLCompilerTool.
+static ProStringList relevantCFlags(const ProStringList &flags)
+{
+    ProStringList result;
+    static const QRegExp rex("^[/-]std:.*");
+    for (const ProString &flag : flags) {
+        if (rex.exactMatch(flag.toQString())) {
+            result.append(flag);
+        }
+    }
+    return result;
+}
+
 void VcprojGenerator::initCompilerTool()
 {
     QString placement = project->first("OBJECTS_DIR").toQString();
@@ -1074,6 +1089,7 @@ void VcprojGenerator::initCompilerTool()
         conf.compiler.ForcedIncludeFiles       = project->values("PRECOMPILED_HEADER").toQStringList();
     }
 
+    conf.compiler.parseOptions(relevantCFlags(project->values("QMAKE_CFLAGS")));
     conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));
 
     if (project->isActiveConfig("windows"))