1 files changed, 8 insertions, 8 deletions

diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
index 96b3455790..f6f48e43a4 100644
--- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
+++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
@@ -346,7 +346,7 @@ void QQmlDebugServerImpl::parseArguments()
     QString fileName;
     QStringList services;
 
-    const auto lstjsDebugArguments = args.splitRef(QLatin1Char(','));
+    const auto lstjsDebugArguments = args.splitRef(QLatin1Char(','), QString::SkipEmptyParts);
     for (auto argsIt = lstjsDebugArguments.begin(), argsItEnd = lstjsDebugArguments.end(); argsIt != argsItEnd; ++argsIt) {
         const QStringRef &strArgument = *argsIt;
         if (strArgument.startsWith(QLatin1String("port:"))) {
@@ -377,7 +377,7 @@ void QQmlDebugServerImpl::parseArguments()
             services.append(strArgument.mid(9).toString());
         } else if (!services.isEmpty()) {
             services.append(strArgument.toString());
-        } else {
+        } else if (!strArgument.startsWith(QLatin1String("connector:"))) {
             const QString message = tr("QML Debugger: Invalid argument \"%1\" detected."
                                        " Ignoring the same.").arg(strArgument.toString());
             qWarning("%s", qPrintable(message));
@@ -589,12 +589,12 @@ void QQmlDebugServerImpl::addEngine(QJSEngine *engine)
     QMutexLocker locker(&m_helloMutex);
     Q_ASSERT(!m_engineConditions.contains(engine));
 
-    foreach (QQmlDebugService *service, m_plugins)
+    for (QQmlDebugService *service : qAsConst(m_plugins))
         service->engineAboutToBeAdded(engine);
 
     m_engineConditions[engine].waitForServices(&m_helloMutex, m_plugins.count());
 
-    foreach (QQmlDebugService *service, m_plugins)
+    for (QQmlDebugService *service : qAsConst(m_plugins))
         service->engineAdded(engine);
 }
 
@@ -606,12 +606,12 @@ void QQmlDebugServerImpl::removeEngine(QJSEngine *engine)
     QMutexLocker locker(&m_helloMutex);
     Q_ASSERT(m_engineConditions.contains(engine));
 
-    foreach (QQmlDebugService *service, m_plugins)
+    for (QQmlDebugService *service : qAsConst(m_plugins))
         service->engineAboutToBeRemoved(engine);
 
     m_engineConditions[engine].waitForServices(&m_helloMutex, m_plugins.count());
 
-    foreach (QQmlDebugService *service, m_plugins)
+    for (QQmlDebugService *service : qAsConst(m_plugins))
         service->engineRemoved(engine);
 
     m_engineConditions.remove(engine);
@@ -703,11 +703,11 @@ void QQmlDebugServerImpl::sendMessages(const QString &name, const QList<QByteArr
         if (m_clientSupportsMultiPackets) {
             QQmlDebugPacket out;
             out << name;
-            foreach (const QByteArray &message, messages)
+            for (const QByteArray &message : messages)
                 out << message;
             m_protocol->send(out.data());
         } else {
-            foreach (const QByteArray &message, messages)
+            for (const QByteArray &message : messages)
                 doSendMessage(name, message);
         }
         m_connection->flush();