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

 Conflicts:
	src/plugins/platforms/windows/qwindowswindow.cpp
	tests/auto/widgets/kernel/qaction/tst_qaction.cpp

Change-Id: Ia017a825ed2ca2d53ac586f4ae48df6f65818d40

4 files changed, 11 insertions, 12 deletions

diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp
index 9db67f2f9b..0ba8b124f7 100644
--- a/src/corelib/io/qfileselector.cpp
+++ b/src/corelib/io/qfileselector.cpp
@@ -146,7 +146,7 @@ QFileSelectorPrivate::QFileSelectorPrivate()
     Selectors normally available are
     \list
     \li platform, any of the following strings which match the platform the application is running
-        on (list not exhaustive): android, ios, osx, darwin, mac, linux, wince, unix, windows.
+        on (list not exhaustive): android, ios, osx, darwin, mac, macos, linux, qnx, unix, windows.
         On Linux, if it can be determined, the name of the distribution too, like debian,
         fedora or opensuse.
     \li locale, same as QLocale().name().
@@ -373,8 +373,8 @@ QStringList QFileSelectorPrivate::platformSelectors()
 #  endif
 #elif defined(Q_OS_UNIX)
     ret << QStringLiteral("unix");
-#  if !defined(Q_OS_ANDROID)
-    // we don't want "linux" for Android
+#  if !defined(Q_OS_ANDROID) && !defined(Q_OS_QNX)
+    // we don't want "linux" for Android or two instances of "qnx" for QNX
     ret << QSysInfo::kernelType();
 #     ifdef Q_OS_MAC
     ret << QStringLiteral("mac"); // compatibility, since kernelType() is "darwin"
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index a499dc2d30..cf7ed130ba 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -1037,6 +1037,7 @@ inline void QUrlPrivate::setAuthority(const QString &auth, int from, int end, QU
 {
     sectionIsPresent &= ~Authority;
     sectionIsPresent |= Host;
+    port = -1;
 
     // we never actually _loop_
     while (from != end) {
@@ -1061,10 +1062,8 @@ inline void QUrlPrivate::setAuthority(const QString &auth, int from, int end, QU
             }
         }
 
-        if (colonIndex == end - 1) {
-            // found a colon but no digits after it
-            port = -1;
-        } else if (uint(colonIndex) < uint(end)) {
+        if (uint(colonIndex) < uint(end) - 1) {
+            // found a colon with digits after it
             unsigned long x = 0;
             for (int i = colonIndex + 1; i < end; ++i) {
                 ushort c = auth.at(i).unicode();
@@ -1083,8 +1082,6 @@ inline void QUrlPrivate::setAuthority(const QString &auth, int from, int end, QU
                 if (mode == QUrl::StrictMode)
                     break;
             }
-        } else {
-            port = -1;
         }
 
         setHost(auth, from, qMin<uint>(end, colonIndex), mode);
@@ -1644,8 +1641,7 @@ inline QUrlPrivate::ErrorCode QUrlPrivate::validityError(QString *source, int *p
     if (path.isEmpty())
         return NoError;
     if (path.at(0) == QLatin1Char('/')) {
-        if (sectionIsPresent & QUrlPrivate::Authority || port != -1 ||
-                path.length() == 1 || path.at(1) != QLatin1Char('/'))
+        if (hasAuthority() || path.length() == 1 || path.at(1) != QLatin1Char('/'))
             return NoError;
         if (source) {
             *source = path;
@@ -2474,6 +2470,8 @@ void QUrl::setPort(int port)
     }
 
     d->port = port;
+    if (port != -1)
+        d->sectionIsPresent |= QUrlPrivate::Host;
 }
 
 /*!
diff --git a/src/corelib/kernel/qfunctions_winrt.h b/src/corelib/kernel/qfunctions_winrt.h
index 9b33f8b120..d0c44be683 100644
--- a/src/corelib/kernel/qfunctions_winrt.h
+++ b/src/corelib/kernel/qfunctions_winrt.h
@@ -44,6 +44,7 @@
 
 #ifdef Q_OS_WIN
 
+#include <QtCore/QCoreApplication>
 #include <QtCore/QThread>
 #include <QtCore/QAbstractEventDispatcher>
 #include <QtCore/QElapsedTimer>
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 1d80da55c9..2808ba2ced 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -411,7 +411,7 @@ QStateMachinePrivate::~QStateMachinePrivate()
     qDeleteAll(internalEventQueue);
     qDeleteAll(externalEventQueue);
 
-    for (QHash<int, DelayedEvent>::const_iterator it = delayedEvents.begin(), eit = delayedEvents.end(); it != eit; ++it) {
+    for (QHash<int, DelayedEvent>::const_iterator it = delayedEvents.cbegin(), eit = delayedEvents.cend(); it != eit; ++it) {
         delete it.value().event;
     }
 }