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

Conflicts:
	src/qml/debugger/qqmldebug.cpp

Change-Id: I93de5a81b18cdece475870cf7cfba1b9baef2304

2 files changed, 5 insertions, 3 deletions

diff --git a/src/qml/debugger/qqmldebug.cpp b/src/qml/debugger/qqmldebug.cpp
index 64004fc86a..b308f5aa29 100644
--- a/src/qml/debugger/qqmldebug.cpp
+++ b/src/qml/debugger/qqmldebug.cpp
@@ -147,6 +147,8 @@ bool QQmlDebuggingEnabler::startTcpDebugServer(int port, StartMode mode, const Q
 }
 
 /*!
+ * \since 5.6
+ *
  * Enables debugging for QML engines created after calling this function. The debug connector will
  * connect to a debugger waiting on a local socket at the given \a socketFileName and block the QML
  * engine until the connection is established if \a mode is \c WaitForClient. If \a mode is not
diff --git a/src/qml/debugger/qqmldebugconnector.cpp b/src/qml/debugger/qqmldebugconnector.cpp
index 8de734fa68..460cb8f203 100644
--- a/src/qml/debugger/qqmldebugconnector.cpp
+++ b/src/qml/debugger/qqmldebugconnector.cpp
@@ -107,9 +107,9 @@ QQmlDebugConnector *QQmlDebugConnector::instance()
 
     if (!QQmlEnginePrivate::qml_debugging_enabled) {
         if (!params->arguments.isEmpty()) {
-            qWarning() << QString::fromLatin1(
-                              "QML Debugger: Ignoring \"-qmljsdebugger=%1\". Debugging has not "
-                              "been enabled.").arg(params->arguments);
+            qWarning().noquote() << QString::fromLatin1(
+                                        "QML Debugger: Ignoring \"-qmljsdebugger=%1\". Debugging "
+                                        "has not been enabled.").arg(params->arguments);
             params->arguments.clear();
         }
         return 0;