Merge remote-tracking branch 'origin/5.9' into 5.10

Change-Id: Iede384644c3df5ee01b701806dfdb586dd6bb138

8 files changed, 172 insertions, 168 deletions

diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
index 720a35902b..84d5adf856 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -723,184 +723,189 @@ public class QtActivityDelegate
 
             Bundle extras = m_activity.getIntent().getExtras();
             if (extras != null) {
-                if ( /*(ai.flags&ApplicationInfo.FLAG_DEBUGGABLE) != 0
-                        &&*/ extras.containsKey("debug_ping")
-                        && extras.getString("debug_ping").equals("true")) {
-                    try {
-                        final String dc = "--Added-by-androiddeployqt--/debugger.command";
-                        String debuggerCommand =
-                            new BufferedReader(new InputStreamReader(m_activity.getAssets().open(dc))).readLine();
-                        String packagePath =
-                            m_activity.getPackageManager().getApplicationInfo(m_activity.getPackageName(),
-                                                                              PackageManager.GET_CONFIGURATIONS).dataDir + "/";
-
-                        debugLog("extra parameters: " + extras);
-                        String packageName = m_activity.getPackageName();
-                        String pingFile = extras.getString("ping_file");
-                        String pongFile = extras.getString("pong_file");
-                        String gdbserverSocket = extras.getString("gdbserver_socket");
-                        String gdbserverCommand = packagePath + debuggerCommand + gdbserverSocket;
-                        String pingSocket = extras.getString("ping_socket");
-                        boolean usePing = pingFile != null;
-                        boolean usePong = pongFile != null;
-                        boolean useSocket = gdbserverSocket != null;
-                        boolean usePingSocket = pingSocket != null;
-                        int napTime = 200; // milliseconds between file accesses
-                        int timeOut = 30000; // ms until we give up on ping and pong
-                        int maxAttempts = timeOut / napTime;
-
-                        if (gdbserverSocket != null) {
-                            debugLog("removing gdb socket " + gdbserverSocket);
-                            new File(gdbserverSocket).delete();
-                        }
-
-                        if (usePing) {
-                            debugLog("removing ping file " + pingFile);
-                            File ping = new File(pingFile);
-                            if (ping.exists()) {
-                                if (!ping.delete())
-                                    debugLog("ping file cannot be deleted");
+                try {
+                    final String dc = "--Added-by-androiddeployqt--/debugger.command";
+                    String debuggerCommand =
+                        new BufferedReader(new InputStreamReader(m_activity.getAssets().open(dc))).readLine();
+                    if ( /*(ai.flags&ApplicationInfo.FLAG_DEBUGGABLE) != 0
+                            &&*/ extras.containsKey("debug_ping")
+                            && extras.getString("debug_ping").equals("true")) {
+                        try {
+                            String packagePath =
+                                m_activity.getPackageManager().getApplicationInfo(m_activity.getPackageName(),
+                                                                                PackageManager.GET_CONFIGURATIONS).dataDir + "/";
+
+                            debugLog("extra parameters: " + extras);
+                            String packageName = m_activity.getPackageName();
+                            String pingFile = extras.getString("ping_file");
+                            String pongFile = extras.getString("pong_file");
+                            String gdbserverSocket = extras.getString("gdbserver_socket");
+                            String gdbserverCommand = packagePath + debuggerCommand + gdbserverSocket;
+                            String pingSocket = extras.getString("ping_socket");
+                            boolean usePing = pingFile != null;
+                            boolean usePong = pongFile != null;
+                            boolean useSocket = gdbserverSocket != null;
+                            boolean usePingSocket = pingSocket != null;
+                            int napTime = 200; // milliseconds between file accesses
+                            int timeOut = 30000; // ms until we give up on ping and pong
+                            int maxAttempts = timeOut / napTime;
+
+                            if (gdbserverSocket != null) {
+                                debugLog("removing gdb socket " + gdbserverSocket);
+                                new File(gdbserverSocket).delete();
                             }
-                        }
 
-                        if (usePong) {
-                            debugLog("removing pong file " + pongFile);
-                            File pong = new File(pongFile);
-                            if (pong.exists()) {
-                                if (!pong.delete())
-                                    debugLog("pong file cannot be deleted");
+                            if (usePing) {
+                                debugLog("removing ping file " + pingFile);
+                                File ping = new File(pingFile);
+                                if (ping.exists()) {
+                                    if (!ping.delete())
+                                        debugLog("ping file cannot be deleted");
+                                }
                             }
-                        }
 
-                        debugLog("starting " + gdbserverCommand);
-                        m_debuggerProcess = Runtime.getRuntime().exec(gdbserverCommand);
-                        debugLog("gdbserver started");
-
-                        if (useSocket) {
-                            int i;
-                            for (i = 0; i < maxAttempts; ++i) {
-                                debugLog("waiting for socket at " + gdbserverSocket + ", attempt " + i);
-                                File file = new File(gdbserverSocket);
-                                if (file.exists()) {
-                                    file.setReadable(true, false);
-                                    file.setWritable(true, false);
-                                    file.setExecutable(true, false);
-                                    break;
+                            if (usePong) {
+                                debugLog("removing pong file " + pongFile);
+                                File pong = new File(pongFile);
+                                if (pong.exists()) {
+                                    if (!pong.delete())
+                                        debugLog("pong file cannot be deleted");
                                 }
-                                Thread.sleep(napTime);
                             }
 
-                            if (i == maxAttempts) {
-                                debugLog("time out when waiting for debug socket");
-                                return false;
+                            debugLog("starting " + gdbserverCommand);
+                            m_debuggerProcess = Runtime.getRuntime().exec(gdbserverCommand);
+                            debugLog("gdbserver started");
+
+                            if (useSocket) {
+                                int i;
+                                for (i = 0; i < maxAttempts; ++i) {
+                                    debugLog("waiting for socket at " + gdbserverSocket + ", attempt " + i);
+                                    File file = new File(gdbserverSocket);
+                                    if (file.exists()) {
+                                        file.setReadable(true, false);
+                                        file.setWritable(true, false);
+                                        file.setExecutable(true, false);
+                                        break;
+                                    }
+                                    Thread.sleep(napTime);
+                                }
+
+                                if (i == maxAttempts) {
+                                    debugLog("time out when waiting for debug socket");
+                                    return false;
+                                }
+
+                                debugLog("socket ok");
+                            } else {
+                                debugLog("socket not used");
                             }
 
-                            debugLog("socket ok");
-                        } else {
-                            debugLog("socket not used");
-                        }
+                            if (usePingSocket) {
+                                DebugWaitRunnable runnable = new DebugWaitRunnable(pingSocket);
+                                Thread waitThread = new Thread(runnable);
+                                waitThread.start();
 
-                        if (usePingSocket) {
-                            DebugWaitRunnable runnable = new DebugWaitRunnable(pingSocket);
-                            Thread waitThread = new Thread(runnable);
-                            waitThread.start();
+                                int i;
+                                for (i = 0; i < maxAttempts && waitThread.isAlive(); ++i) {
+                                    debugLog("Waiting for debug socket connect");
+                                    debugLog("go to sleep");
+                                    Thread.sleep(napTime);
+                                }
 
-                            int i;
-                            for (i = 0; i < maxAttempts && waitThread.isAlive(); ++i) {
-                                debugLog("Waiting for debug socket connect");
-                                debugLog("go to sleep");
-                                Thread.sleep(napTime);
-                            }
+                                if (i == maxAttempts) {
+                                    debugLog("time out when waiting for ping socket");
+                                    runnable.shutdown();
+                                    return false;
+                                }
 
-                            if (i == maxAttempts) {
-                                debugLog("time out when waiting for ping socket");
-                                runnable.shutdown();
-                                return false;
+                                if (runnable.wasFailure) {
+                                    debugLog("Could not connect to debug client");
+                                    return false;
+                                } else {
+                                    debugLog("Got pid acknowledgment");
+                                }
                             }
 
-                            if (runnable.wasFailure) {
-                                debugLog("Could not connect to debug client");
-                                return false;
+                            if (usePing) {
+                                // Tell we are ready.
+                                debugLog("writing ping at " + pingFile);
+                                FileWriter writer = new FileWriter(pingFile);
+                                writer.write("" + android.os.Process.myPid());
+                                writer.close();
+                                File file = new File(pingFile);
+                                file.setReadable(true, false);
+                                file.setWritable(true, false);
+                                file.setExecutable(true, false);
+                                debugLog("wrote ping");
                             } else {
-                                debugLog("Got pid acknowledgment");
+                                debugLog("ping not requested");
                             }
-                        }
 
-                        if (usePing) {
-                            // Tell we are ready.
-                            debugLog("writing ping at " + pingFile);
-                            FileWriter writer = new FileWriter(pingFile);
-                            writer.write("" + android.os.Process.myPid());
-                            writer.close();
-                            File file = new File(pingFile);
-                            file.setReadable(true, false);
-                            file.setWritable(true, false);
-                            file.setExecutable(true, false);
-                            debugLog("wrote ping");
-                        } else {
-                            debugLog("ping not requested");
-                        }
+                            // Wait until other side is ready.
+                            if (usePong) {
+                                int i;
+                                for (i = 0; i < maxAttempts; ++i) {
+                                    debugLog("waiting for pong at " + pongFile + ", attempt " + i);
+                                    File file = new File(pongFile);
+                                    if (file.exists()) {
+                                        file.delete();
+                                        break;
+                                    }
+                                    debugLog("go to sleep");
+                                    Thread.sleep(napTime);
+                                }
+                                debugLog("Removing pingFile " + pingFile);
+                                new File(pingFile).delete();
 
-                        // Wait until other side is ready.
-                        if (usePong) {
-                            int i;
-                            for (i = 0; i < maxAttempts; ++i) {
-                                debugLog("waiting for pong at " + pongFile + ", attempt " + i);
-                                File file = new File(pongFile);
-                                if (file.exists()) {
-                                    file.delete();
-                                    break;
+                                if (i == maxAttempts) {
+                                    debugLog("time out when waiting for pong file");
+                                    return false;
                                 }
-                                debugLog("go to sleep");
-                                Thread.sleep(napTime);
-                            }
-                            debugLog("Removing pingFile " + pingFile);
-                            new File(pingFile).delete();
 
-                            if (i == maxAttempts) {
-                                debugLog("time out when waiting for pong file");
-                                return false;
+                                debugLog("got pong " + pongFile);
+                            } else {
+                                debugLog("pong not requested");
                             }
 
-                            debugLog("got pong " + pongFile);
-                        } else {
-                            debugLog("pong not requested");
+                        } catch (IOException ioe) {
+                            ioe.printStackTrace();
+                        } catch (SecurityException se) {
+                            se.printStackTrace();
                         }
-
-                    } catch (IOException ioe) {
-                        ioe.printStackTrace();
-                    } catch (SecurityException se) {
-                        se.printStackTrace();
                     }
-                }
 
-                if (/*(ai.flags&ApplicationInfo.FLAG_DEBUGGABLE) != 0
-                        &&*/ extras.containsKey("qml_debug")
-                        && extras.getString("qml_debug").equals("true")) {
-                    String qmljsdebugger;
-                    if (extras.containsKey("qmljsdebugger")) {
-                        qmljsdebugger = extras.getString("qmljsdebugger");
-                        qmljsdebugger.replaceAll("\\s", ""); // remove whitespace for security
-                    } else {
-                        qmljsdebugger = "port:3768";
+                    if (/*(ai.flags&ApplicationInfo.FLAG_DEBUGGABLE) != 0
+                            &&*/ extras.containsKey("qml_debug")
+                            && extras.getString("qml_debug").equals("true")) {
+                        String qmljsdebugger;
+                        if (extras.containsKey("qmljsdebugger")) {
+                            qmljsdebugger = extras.getString("qmljsdebugger");
+                            qmljsdebugger.replaceAll("\\s", ""); // remove whitespace for security
+                        } else {
+                            qmljsdebugger = "port:3768";
+                        }
+                        m_applicationParameters += "\t-qmljsdebugger=" + qmljsdebugger;
                     }
-                    m_applicationParameters += "\t-qmljsdebugger=" + qmljsdebugger;
-                }
 
-                if (extras.containsKey("extraenvvars")) {
-                    try {
-                        m_environmentVariables += "\t" + new String(Base64.decode(extras.getString("extraenvvars"), Base64.DEFAULT), "UTF-8");
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                    if (extras.containsKey("extraenvvars")) {
+                        try {
+                            m_environmentVariables += "\t" + new String(Base64.decode(extras.getString("extraenvvars"), Base64.DEFAULT), "UTF-8");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
-                }
 
-                if (extras.containsKey("extraappparams")) {
-                    try {
-                        m_applicationParameters += "\t" + new String(Base64.decode(extras.getString("extraappparams"), Base64.DEFAULT), "UTF-8");
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                    if (extras.containsKey("extraappparams")) {
+                        try {
+                            m_applicationParameters += "\t" + new String(Base64.decode(extras.getString("extraappparams"), Base64.DEFAULT), "UTF-8");
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
+                } catch (Exception e) {
+                    // This is not an error, so keep it silent
+                    // e.printStackTrace();
                 }
             } // extras != null
 
diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h
index feeb488acd..72b0a689ff 100644
--- a/src/corelib/global/qflags.h
+++ b/src/corelib/global/qflags.h
@@ -150,7 +150,7 @@ public:
     Q_DECL_CONSTEXPR inline bool testFlag(Enum f) const Q_DECL_NOTHROW { return (i & Int(f)) == Int(f) && (Int(f) != 0 || i == Int(f) ); }
     Q_DECL_RELAXED_CONSTEXPR inline QFlags &setFlag(Enum f, bool on = true) Q_DECL_NOTHROW
     {
-        return on ? (*this |= f) : (*this &= ~f);
+        return on ? (*this |= f) : (*this &= ~Int(f));
     }
 
 private:
diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp
index 0e7eaeea76..1bf61017f6 100644
--- a/src/corelib/io/qloggingregistry.cpp
+++ b/src/corelib/io/qloggingregistry.cpp
@@ -255,6 +255,7 @@ void QLoggingSettingsParser::parseNextLine(QStringRef line)
 QLoggingRegistry::QLoggingRegistry()
     : categoryFilter(defaultCategoryFilter)
 {
+    initalizeRules(); // Init on first use
 }
 
 static bool qtLoggingDebug()
@@ -283,7 +284,7 @@ static QVector<QLoggingRule> loadRulesFromFile(const QString &filePath)
     Initializes the rules database by loading
     $QT_LOGGING_CONF, $QT_LOGGING_RULES, and .config/QtProject/qtlogging.ini.
  */
-void QLoggingRegistry::init()
+void QLoggingRegistry::initalizeRules()
 {
     QVector<QLoggingRule> er, qr, cr;
     // get rules from environment
diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h
index a68b993cca..a3857d3588 100644
--- a/src/corelib/io/qloggingregistry_p.h
+++ b/src/corelib/io/qloggingregistry_p.h
@@ -113,7 +113,7 @@ class Q_AUTOTEST_EXPORT QLoggingRegistry
 public:
     QLoggingRegistry();
 
-    void init();
+    void initalizeRules();
 
     void registerCategory(QLoggingCategory *category, QtMsgType enableForLevel);
     void unregisterCategory(QLoggingCategory *category);
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 609e52d9d2..350be50082 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -802,8 +802,6 @@ void QCoreApplicationPrivate::init()
     if (!coreappdata()->applicationVersionSet)
         coreappdata()->applicationVersion = appVersion();
 
-    QLoggingRegistry::instance()->init();
-
 #if QT_CONFIG(library)
     // Reset the lib paths, so that they will be recomputed, taking the availability of argv[0]
     // into account. If necessary, recompute right away and replay the manual changes on top of the
diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp
index 96c031eec6..37736b3960 100644
--- a/src/corelib/thread/qsemaphore.cpp
+++ b/src/corelib/thread/qsemaphore.cpp
@@ -217,13 +217,15 @@ bool QSemaphore::tryAcquire(int n)
 bool QSemaphore::tryAcquire(int n, int timeout)
 {
     Q_ASSERT_X(n >= 0, "QSemaphore::tryAcquire", "parameter 'n' must be non-negative");
-    if (timeout < 0)
-        return tryAcquire(n);
+
+    // We're documented to accept any negative value as "forever"
+    // but QDeadlineTimer only accepts -1.
+    timeout = qMax(timeout, -1);
 
     QDeadlineTimer timer(timeout);
     QMutexLocker locker(&d->mutex);
     qint64 remainingTime = timer.remainingTime();
-    while (n > d->avail && remainingTime > 0) {
+    while (n > d->avail && remainingTime != 0) {
         if (!d->cond.wait(locker.mutex(), remainingTime))
             return false;
         remainingTime = timer.remainingTime();
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index e6a15ccfc4..8fdcc91efc 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -1231,20 +1231,20 @@ void QHttpNetworkConnectionPrivate::_q_hostLookupFinished(const QHostInfo &info)
         if (dequeueRequest(channels[0].socket)) {
             emitReplyError(channels[0].socket, channels[0].reply, QNetworkReply::HostNotFoundError);
             networkLayerState = QHttpNetworkConnectionPrivate::Unknown;
-        }
-#ifndef QT_NO_SSL
-        else if (connectionType == QHttpNetworkConnection::ConnectionTypeSPDY) {
+        } else if (connectionType == QHttpNetworkConnection::ConnectionTypeSPDY
+                   || connectionType == QHttpNetworkConnection::ConnectionTypeHTTP2) {
             for (const HttpMessagePair &spdyPair : qAsConst(channels[0].spdyRequestsToSend)) {
                 // emit error for all replies
                 QHttpNetworkReply *currentReply = spdyPair.second;
                 Q_ASSERT(currentReply);
                 emitReplyError(channels[0].socket, currentReply, QNetworkReply::HostNotFoundError);
             }
-        }
-#endif // QT_NO_SSL
-        else {
-            // Should not happen
-            qWarning("QHttpNetworkConnectionPrivate::_q_hostLookupFinished could not de-queue request");
+        } else {
+            // Should not happen: we start a host lookup before sending a request,
+            // so it's natural to have requests either in SPDY/HTTP/2 queue,
+            // or in low/high priority queues.
+            qWarning("QHttpNetworkConnectionPrivate::_q_hostLookupFinished"
+                     " could not de-queue request, failed to report HostNotFoundError");
             networkLayerState = QHttpNetworkConnectionPrivate::Unknown;
         }
     }
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp
index bd368ac42f..747fdeb967 100644
--- a/src/network/socket/qnativesocketengine_win.cpp
+++ b/src/network/socket/qnativesocketengine_win.cpp
@@ -1213,10 +1213,8 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxL
     msg.dwBufferCount = 1;
     msg.name = reinterpret_cast<LPSOCKADDR>(&aa);
     msg.namelen = sizeof(aa);
-    if (options & (QAbstractSocketEngine::WantDatagramHopLimit | QAbstractSocketEngine::WantDatagramDestination)) {
-        msg.Control.buf = cbuf;
-        msg.Control.len = sizeof(cbuf);
-    }
+    msg.Control.buf = cbuf;
+    msg.Control.len = sizeof(cbuf);
 
     DWORD flags = 0;
     DWORD bytesRead = 0;