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

 Conflicts:
	mkspecs/win32-clang-msvc/qmake.conf
	src/gui/image/qpnghandler.cpp

Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8

2 files changed, 66 insertions, 4 deletions

diff --git a/tests/auto/network/kernel/qhostinfo/BLACKLIST b/tests/auto/network/kernel/qhostinfo/BLACKLIST
index cd4d4eb03c..87c5fe991f 100644
--- a/tests/auto/network/kernel/qhostinfo/BLACKLIST
+++ b/tests/auto/network/kernel/qhostinfo/BLACKLIST
@@ -4,5 +4,3 @@
 windows ci
 [blockingLookup:a-plus-aaaa]
 windows ci
-[reverseLookup:google-public-dns-a.google.com]
-ci
diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index d85845284a..da6e02210b 100644
--- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -393,6 +393,68 @@ void tst_QHostInfo::lookupConnectToLambda()
     QCOMPARE(tmp.join(' '), expected.join(' '));
 }
 
+static QStringList reverseLookupHelper(const QString &ip)
+{
+    QStringList results;
+
+    const QString pythonCode =
+        "import socket;"
+        "import sys;"
+        "print (socket.getnameinfo((sys.argv[1], 0), 0)[0]);";
+
+    QList<QByteArray> lines;
+    QProcess python;
+    python.setProcessChannelMode(QProcess::ForwardedErrorChannel);
+    python.start("python", QStringList() << QString("-c") << pythonCode << ip);
+    if (python.waitForFinished()) {
+        if (python.exitStatus() == QProcess::NormalExit && python.exitCode() == 0)
+            lines = python.readAllStandardOutput().split('\n');
+        for (QByteArray line : lines) {
+            if (!line.isEmpty())
+                results << line.trimmed();
+        }
+        if (!results.isEmpty())
+            return results;
+    }
+
+    qDebug() << "Python failed, falling back to nslookup";
+    QProcess lookup;
+    lookup.setProcessChannelMode(QProcess::ForwardedErrorChannel);
+    lookup.start("nslookup", QStringList(ip));
+    if (!lookup.waitForFinished()) {
+        results << "nslookup failure";
+        qDebug() << "nslookup failure";
+        return results;
+    }
+    lines = lookup.readAllStandardOutput().split('\n');
+
+    QByteArray name;
+
+    const QByteArray nameMarkerNix("name =");
+    const QByteArray nameMarkerWin("Name:");
+    const QByteArray addressMarkerWin("Address:");
+
+    for (QByteArray line : lines) {
+        int index = -1;
+        if ((index = line.indexOf(nameMarkerNix)) != -1) { // Linux and macOS
+            name = line.mid(index + nameMarkerNix.length()).chopped(1).trimmed();
+            results << name;
+        } else if (line.startsWith(nameMarkerWin)) { // Windows formatting
+            name = line.mid(line.lastIndexOf(" ")).trimmed();
+        } else if (line.startsWith(addressMarkerWin)) {
+            QByteArray address = line.mid(addressMarkerWin.length()).trimmed();
+            if (address == ip) {
+                results << name;
+            }
+        }
+    }
+
+    if (results.isEmpty()) {
+        qDebug() << "Failure to parse nslookup output: " << lines;
+    }
+    return results;
+}
+
 void tst_QHostInfo::reverseLookup_data()
 {
     QTest::addColumn<QString>("address");
@@ -400,8 +462,8 @@ void tst_QHostInfo::reverseLookup_data()
     QTest::addColumn<int>("err");
     QTest::addColumn<bool>("ipv6");
 
-    QTest::newRow("google-public-dns-a.google.com") << QString("8.8.8.8") << QStringList(QString("google-public-dns-a.google.com")) << 0 << false;
-    QTest::newRow("gitorious.org") << QString("87.238.52.168") << QStringList(QString("gitorious.org")) << 0 << false;
+    QTest::newRow("dns.google") << QString("8.8.8.8") << reverseLookupHelper("8.8.8.8") << 0 << false;
+    QTest::newRow("one.one.one.one") << QString("1.1.1.1") << reverseLookupHelper("1.1.1.1") << 0 << false;
     QTest::newRow("bogus-name") << QString("1::2::3::4") << QStringList() << 1 << true;
 }
 
@@ -419,6 +481,8 @@ void tst_QHostInfo::reverseLookup()
     QHostInfo info = QHostInfo::fromName(address);
 
     if (err == 0) {
+        if (!hostNames.contains(info.hostName()))
+            qDebug() << "Failure: expecting" << hostNames << ",got " << info.hostName();
         QVERIFY(hostNames.contains(info.hostName()));
         QCOMPARE(info.addresses().first(), QHostAddress(address));
     } else {