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

 Conflicts:
	src/imports/imports.pro
	src/src.pro

Change-Id: Icdc39b6169d15b2102acd0e4d550a8d91e4b0744

1 files changed, 11 insertions, 5 deletions

diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp
index a6f7fa8724..46f504f6d3 100644
--- a/tests/auto/qml/debugger/shared/debugutil.cpp
+++ b/tests/auto/qml/debugger/shared/debugutil.cpp
@@ -31,8 +31,6 @@
 
 #include <private/qqmldebugconnection_p.h>
 
-#include <QtQml/qqmldebug.h>
-
 #include <QtCore/qeventloop.h>
 #include <QtCore/qtimer.h>
 
@@ -52,15 +50,23 @@ bool QQmlDebugTest::waitForSignal(QObject *receiver, const char *member, int tim
 QList<QQmlDebugClient *> QQmlDebugTest::createOtherClients(QQmlDebugConnection *connection)
 {
     QList<QQmlDebugClient *> ret;
-    foreach (const QString &service, QQmlDebuggingEnabler::debuggerServices()) {
+
+    static const auto debuggerServices
+            = QStringList({"V8Debugger", "QmlDebugger", "DebugMessages"});
+    static const auto inspectorServices
+            = QStringList({"QmlInspector"});
+    static const auto profilerServices
+            = QStringList({"CanvasFrameRate", "EngineControl", "DebugMessages"});
+
+    for (const QString &service : debuggerServices) {
         if (!connection->client(service))
             ret << new QQmlDebugClient(service, connection);
     }
-    foreach (const QString &service, QQmlDebuggingEnabler::inspectorServices()) {
+    for (const QString &service : inspectorServices) {
         if (!connection->client(service))
             ret << new QQmlDebugClient(service, connection);
     }
-    foreach (const QString &service, QQmlDebuggingEnabler::profilerServices()) {
+    for (const QString &service : profilerServices) {
         if (!connection->client(service))
             ret << new QQmlDebugClient(service, connection);
     }