1 files changed, 19 insertions, 4 deletions
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/qqmldebuggingenablerserver.cpp b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/qqmldebuggingenablerserver.cpp
index cfbb31f9e1..a064bbbacc 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/qqmldebuggingenablerserver.cpp
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenablerserver/qqmldebuggingenablerserver.cpp
@@ -28,6 +28,7 @@
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qlibraryinfo.h>
+#include <QtCore/qdebug.h>
 #include <QtQml/qqmldebug.h>
 #include <QtQml/qqmlengine.h>
 
@@ -40,12 +41,18 @@ int main(int argc, char *argv[])
       QCoreApplication app(argc, argv);
       QStringList arguments = app.arguments();
       arguments.removeFirst();
+      QString connector = QLatin1String("QQmlDebugServer");
 
       if (arguments.size() && arguments.first() == QLatin1String("-block")) {
           block = QQmlDebuggingEnabler::WaitForClient;
           arguments.removeFirst();
       }
 
+      if (arguments.size() >= 2 && arguments.first() == QLatin1String("-connector")) {
+          arguments.removeFirst();
+          connector = arguments.takeFirst();
+      }
+
       if (arguments.size() >= 2) {
           portFrom = arguments.takeFirst().toInt();
           portTo = arguments.takeFirst().toInt();
@@ -54,12 +61,20 @@ int main(int argc, char *argv[])
       if (arguments.size() && arguments.takeFirst() == QLatin1String("-services"))
           QQmlDebuggingEnabler::setServices(arguments);
 
-      if (!portFrom || !portTo)
-          qFatal("Port range has to be specified.");
+      if (connector == QLatin1String("QQmlDebugServer")) {
+          if (!portFrom || !portTo)
+              qFatal("Port range has to be specified.");
+
+          while (portFrom <= portTo)
+              QQmlDebuggingEnabler::startTcpDebugServer(portFrom++, block);
+      } else if (connector == QLatin1String("QQmlNativeDebugConnector")) {
+          QVariantHash configuration;
+          configuration[QLatin1String("block")] = (block == QQmlDebuggingEnabler::WaitForClient);
+          QQmlDebuggingEnabler::startDebugConnector(connector, configuration);
+      }
 
-      while (portFrom <= portTo)
-          QQmlDebuggingEnabler::startTcpDebugServer(portFrom++, block);
       QQmlEngine engine;
+      qDebug() << "QQmlEngine created\n";
       Q_UNUSED(engine);
       return app.exec();
 }