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

Also blacklist tst_QRawFont::unsupportedWritingSystem() and
tst_QGlyphRun::mixedScripts() on windows for now.

 Conflicts:
	qmake/generators/makefile.cpp
	src/corelib/itemmodels/qstringlistmodel.cpp
	src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
	tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
	tests/auto/gui/text/qglyphrun/BLACKLIST
	tests/auto/gui/text/qrawfont/BLACKLIST

Task-number: QTBUG-72836
Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9

4 files changed, 25 insertions, 28 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 71569660eb..9e2f449515 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1289,6 +1289,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, bool noBuild)
                     }
                 }
                 bool is_target = (wild == fileFixify(var("TARGET"), FileFixifyAbsolute));
+                const bool noStrip = installConfigValues.contains("nostrip");
                 if(is_target || exists(wild)) { //real file or target
                     QFileInfo fi(fileInfo(wild));
                     QString dst_file = filePrefixRoot(root, dst_dir);
@@ -1302,7 +1303,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, bool noBuild)
                        cmd = QLatin1String("-$(QINSTALL)");
                     cmd += " " + escapeFilePath(wild) + " " + escapeFilePath(dst_file);
                     inst << cmd;
-                    if (!project->isActiveConfig("debug_info") && !project->isActiveConfig("nostrip") &&
+                    if (!noStrip && !project->isActiveConfig("debug_info") && !project->isActiveConfig("nostrip") &&
                        !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
                         inst << QString("-") + var("QMAKE_STRIP") + " " +
                                   escapeFilePath(filePrefixRoot(root, fileFixify(dst_dir + filestr, FileFixifyAbsolute, false)));
@@ -1337,7 +1338,7 @@ MakefileGenerator::writeInstalls(QTextStream &t, bool noBuild)
                     QString cmd = QLatin1String("-$(QINSTALL) ") +
                                   escapeFilePath(dirstr + file) + " " + escapeFilePath(dst_file);
                     inst << cmd;
-                    if (!project->isActiveConfig("debug_info") && !project->isActiveConfig("nostrip") &&
+                    if (!noStrip && !project->isActiveConfig("debug_info") && !project->isActiveConfig("nostrip") &&
                        !fi.isDir() && fi.isExecutable() && !project->isEmpty("QMAKE_STRIP"))
                         inst << QString("-") + var("QMAKE_STRIP") + " " +
                                   escapeFilePath(filePrefixRoot(root, fileFixify(dst_dir + file, FileFixifyAbsolute, false)));
@@ -1875,12 +1876,14 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
         if (config.indexOf("combine") != -1) {
             // compilers with a combined input only have one output
             QString input = project->first(ProKey(*it + ".output")).toQString();
-            t << ' ' << escapeDependencyPath(Option::fixPathToTargetOS(
-                    replaceExtraCompilerVariables(tmp_out, input, QString(), NoShell)));
+            t << ' ' << escapeDependencyPath(fileFixify(
+                    replaceExtraCompilerVariables(tmp_out, input, QString(), NoShell),
+                    FileFixifyFromOutdir));
         } else {
             for (ProStringList::ConstIterator input = tmp_inputs.cbegin(); input != tmp_inputs.cend(); ++input) {
-                t << ' ' << escapeDependencyPath(Option::fixPathToTargetOS(
-                        replaceExtraCompilerVariables(tmp_out, (*input).toQString(), QString(), NoShell)));
+                t << ' ' << escapeDependencyPath(fileFixify(
+                        replaceExtraCompilerVariables(tmp_out, (*input).toQString(), QString(), NoShell),
+                        FileFixifyFromOutdir));
             }
         }
         t << endl;
@@ -1916,8 +1919,9 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                         QString tinp = (*input).toQString();
                         QString out = replaceExtraCompilerVariables(tmp_out, tinp, QString(), NoShell);
                         for (const QString &rc : qAsConst(raw_clean)) {
-                            dels << ' ' + escapeFilePath(Option::fixPathToTargetOS(
-                                    replaceExtraCompilerVariables(rc, tinp, out, NoShell), false));
+                            dels << ' ' + escapeFilePath(fileFixify(
+                                    replaceExtraCompilerVariables(rc, tinp, out, NoShell),
+                                    FileFixifyFromOutdir));
                         }
                     }
                     if(project->isActiveConfig("no_delete_multiple_files")) {
@@ -2033,7 +2037,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
 
             QString out = replaceExtraCompilerVariables(tmp_out, QString(), QString(), NoShell);
             QString cmd = replaceExtraCompilerVariables(tmp_cmd, inputs, QStringList() << out, TargetShell);
-            t << escapeDependencyPath(Option::fixPathToTargetOS(out)) << ":";
+            t << escapeDependencyPath(fileFixify(out, FileFixifyFromOutdir)) << ":";
             // compiler.CONFIG+=explicit_dependencies means that ONLY compiler.depends gets to cause Makefile dependencies
             if (config.indexOf("explicit_dependencies") != -1) {
                 t << " " << valList(escapeDependencyPaths(fileFixify(tmp_dep, FileFixifyFromOutdir)));
@@ -2045,14 +2049,16 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
         }
         for (ProStringList::ConstIterator input = tmp_inputs.cbegin(); input != tmp_inputs.cend(); ++input) {
             QString inpf = (*input).toQString();
-            QString in = Option::fixPathToTargetOS(inpf, false);
-            QStringList deps = findDependencies(inpf);
-            deps << in;
-            QString out = Option::fixPathToTargetOS(replaceExtraCompilerVariables(tmp_out, inpf, QString(), NoShell));
+            QStringList deps;
+            deps << fileFixify(inpf, FileFixifyFromOutdir);
+            deps += findDependencies(inpf);
+            QString out = fileFixify(replaceExtraCompilerVariables(tmp_out, inpf, QString(), NoShell),
+                                     FileFixifyFromOutdir);
             if(!tmp_dep.isEmpty()) {
                 QStringList pre_deps = fileFixify(tmp_dep, FileFixifyFromOutdir);
                 for(int i = 0; i < pre_deps.size(); ++i)
-                   deps << replaceExtraCompilerVariables(pre_deps.at(i), inpf, out, NoShell);
+                   deps << fileFixify(replaceExtraCompilerVariables(pre_deps.at(i), inpf, out, NoShell),
+                                      FileFixifyFromOutdir);
             }
             QString cmd = replaceExtraCompilerVariables(tmp_cmd, inpf, out, TargetShell);
             // NOTE: The var -> QMAKE_COMP_var replace feature is unsupported, do not use!
@@ -2112,7 +2118,7 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                 //use the depend system to find includes of these included files
                 QStringList inc_deps;
                 for(int i = 0; i < deps.size(); ++i) {
-                    const QString dep = deps.at(i);
+                    const QString dep = fileFixify(deps.at(i), FileFixifyFromOutdir | FileFixifyAbsolute);
                     if(QFile::exists(dep)) {
                         SourceFileType type = TYPE_UNKNOWN;
                         if(type == TYPE_UNKNOWN) {
@@ -2149,11 +2155,10 @@ MakefileGenerator::writeExtraCompilerTargets(QTextStream &t)
                         }
                     }
                 }
-                deps += inc_deps;
+                deps += fileFixify(inc_deps, FileFixifyFromOutdir);
             }
             for(int i = 0; i < deps.size(); ) {
                 QString &dep = deps[i];
-                dep = Option::fixPathToTargetOS(dep, false);
                 if(out == dep)
                     deps.removeAt(i);
                 else
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 780f6bd4d8..548d2e8575 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -195,11 +195,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
                     incDirs << crtInclude + QStringLiteral("/winrt");
 
                     if (winrtBuild) {
-                        // Only use mobile-specific headers and link against store-specific libs for
-                        // winrt builds.
-                        incDirs << kitDir + QStringLiteral("Extension SDKs/WindowsMobile/")
-                                          + crtVersion + QStringLiteral("/Include/WinRT");
-
                         libDirs << toolsInstallDir + QStringLiteral("lib/") + arch + QStringLiteral("/store");
                     } else {
                         // Desktop projects may require the atl headers and libs.
@@ -236,9 +231,6 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
                     incDirs << crtInclude + QStringLiteral("/shared");
                     incDirs << crtInclude + QStringLiteral("/winrt");
 
-                    incDirs << kitDir + QStringLiteral("Extension SDKs/WindowsMobile/")
-                                      + crtVersion + QStringLiteral("/Include/WinRT");
-
                     libDirs << vcInstallDir + QStringLiteral("lib/store/") + compilerArch;
                     libDirs << vcInstallDir + QStringLiteral("atlmfc/lib") + compilerArch;
 
diff --git a/qmake/generators/win32/registry_p.h b/qmake/generators/win32/registry_p.h
index 3526dffd45..f9e8bba016 100644
--- a/qmake/generators/win32/registry_p.h
+++ b/qmake/generators/win32/registry_p.h
@@ -40,8 +40,6 @@
 // We mean it.
 //
 
-QT_BEGIN_NAMESPACE
-
 #include <QtCore/qglobal.h>
 
 #ifdef Q_OS_WIN32
@@ -52,6 +50,8 @@ QT_BEGIN_NAMESPACE
 
 #include <QtCore/qstring.h>
 
+QT_BEGIN_NAMESPACE
+
 /**
  * Read a value from the Windows registry.
  *
diff --git a/qmake/qmake_pch.h b/qmake/qmake_pch.h
index c0f62b263d..c97c872311 100644
--- a/qmake/qmake_pch.h
+++ b/qmake/qmake_pch.h
@@ -54,10 +54,10 @@
 #include <stdlib.h>
 #include <qregexp.h>
 
-QT_BEGIN_NAMESPACE
 //#include <qdir.h>
 //#include "option.h"
 
+QT_BEGIN_NAMESPACE
 QT_END_NAMESPACE
 
 #endif