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

Change-Id: I7c12121a87fe29b2058e2971eb8f9a0b76fa4940

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/platforms/webgl/qwebglmain.cpp b/src/plugins/platforms/webgl/qwebglmain.cpp
index 9f34cb3..dd14bec 100644
--- a/src/plugins/platforms/webgl/qwebglmain.cpp
+++ b/src/plugins/platforms/webgl/qwebglmain.cpp
@@ -50,13 +50,13 @@ QPlatformIntegration* QWebGLIntegrationPlugin::create(const QString& system,
     if (!paramList.isEmpty()) {
         for (const QString &parameter : qAsConst(paramList)) {
             const QStringList parts = parameter.split('=');
-            if (parts.first() == QStringLiteral("port") && parts.size() == 2) {
+            if (parts.first() == QStringLiteral("port")) {
                 if (parts.size() != 2) {
                     qCCritical(lcWebGL, "QWebGLIntegrationPlugin::create: No port specified");
                     return nullptr;
                 }
                 bool ok;
-                port = parts.last().toUInt(&ok);
+                port = parts.last().toUShort(&ok);
                 if (!ok) {
                     qCCritical(lcWebGL, "QWebGLIntegrationPlugin::create: Invalid port number");
                     return nullptr;