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

Conflicts:
	configure
	src/3rdparty/double-conversion/include/double-conversion/utils.h
	src/corelib/global/qnamespace.qdoc
	src/corelib/tools/qsimd_p.h
	tests/auto/corelib/io/qfile/tst_qfile.cpp

Change-Id: I3ca1007bab5355d251c13002a18e93d81c254d34

1 files changed, 13 insertions, 0 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 882ccd62c6..40a4c1600e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -160,6 +160,7 @@ Configure::Configure(int& argc, char** argv) : verbose(0)
     dictionary[ "QML_DEBUG" ]       = "yes";
     dictionary[ "PLUGIN_MANIFESTS" ] = "no";
     dictionary[ "DIRECTWRITE" ]     = "auto";
+    dictionary[ "DIRECTWRITE2" ]    = "auto";
     dictionary[ "DIRECT2D" ]        = "no";
     dictionary[ "NIS" ]             = "no";
     dictionary[ "NEON" ]            = "auto";
@@ -2132,6 +2133,8 @@ bool Configure::checkAvailability(const QString &part)
         available = findFile("mfapi.h") && findFile("mf.lib");
     } else if (part == "DIRECTWRITE") {
         available = tryCompileProject("win/directwrite");
+    } else if (part == "DIRECTWRITE2") {
+        available = tryCompileProject("win/directwrite2");
     } else if (part == "DIRECT2D") {
         available = tryCompileProject("qpa/direct2d");
     } else if (part == "ICONV") {
@@ -2363,6 +2366,9 @@ void Configure::autoDetection()
     if (dictionary["DIRECTWRITE"] == "auto")
         dictionary["DIRECTWRITE"] = checkAvailability("DIRECTWRITE") ? "yes" : "no";
 
+    if (dictionary["DIRECTWRITE2"] == "auto")
+        dictionary["DIRECTWRITE2"] = checkAvailability("DIRECTWRITE2") ? "yes" : "no";
+
     // Mark all unknown "auto" to the default value..
     for (QMap<QString,QString>::iterator i = dictionary.begin(); i != dictionary.end(); ++i) {
         if (i.value() == "auto")
@@ -2735,6 +2741,9 @@ void Configure::generateOutputVars()
     if (dictionary["DIRECTWRITE"] == "yes")
         qtConfig += "directwrite";
 
+    if (dictionary["DIRECTWRITE2"] == "yes")
+        qtConfig += "directwrite2";
+
     if (dictionary["DIRECT2D"] == "yes")
         qtConfig += "direct2d";
 
@@ -3253,6 +3262,9 @@ void Configure::generateQConfigPri()
         if (dictionary["DIRECTWRITE"] == "yes")
             configStream << " directwrite";
 
+        if (dictionary["DIRECTWRITE2"] == "yes")
+            configStream << " directwrite2";
+
         if (dictionary["ANDROID_STYLE_ASSETS"] == "yes")
             configStream << " android-style-assets";
 
@@ -3585,6 +3597,7 @@ void Configure::displayConfig()
     sout << "Qt GUI module support......." << dictionary[ "GUI" ] << endl;
     sout << "QML debugging..............." << dictionary[ "QML_DEBUG" ] << endl;
     sout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl;
+    sout << "DirectWrite 2 support......." << dictionary[ "DIRECTWRITE2" ] << endl;
     sout << "Use system proxies.........." << dictionary[ "SYSTEM_PROXIES" ] << endl;
     sout << endl;