5 files changed, 34 insertions, 13 deletions
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri
new file mode 100644
index 0000000000..4b78707c3d
--- /dev/null
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri
@@ -0,0 +1,14 @@
+QT += network core-private
+
+SOURCES += \
+    $$PWD/qtcpserverconnection.cpp \
+    $$PWD/../shared/qpacketprotocol.cpp
+
+HEADERS += \
+    $$PWD/qtcpserverconnection.h \
+    $$PWD/../shared/qpacketprotocol.h
+
+INCLUDEPATH += $$PWD \
+    $$PWD/../shared
+
+OTHER_FILES += $$PWD/qtcpserverconnection.json
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index bd2b4bd52c..e9dba5fdaf 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -1,18 +1,8 @@
 TARGET = qmldbg_tcp
-QT = qml-private network  core-private
+QT = qml-private
 
 PLUGIN_TYPE = qmltooling
 PLUGIN_CLASS_NAME = QTcpServerConnection
 load(qt_plugin)
 
-SOURCES += \
-    qtcpserverconnection.cpp \
-    ../shared/qpacketprotocol.cpp
-
-HEADERS += \
-    qtcpserverconnection.h \
-    ../shared/qpacketprotocol.h
-
-INCLUDEPATH += ../shared
-
-OTHER_FILES += qtcpserverconnection.json
+include(qmldbg_tcp.pri)
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
index 525ed50e51..b75ae47b9d 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
@@ -42,7 +42,7 @@
 #ifndef QTCPSERVERCONNECTION_H
 #define QTCPSERVERCONNECTION_H
 
-#include <QtQml/private/qqmldebugserverconnection_p.h>
+#include <private/qqmldebugserverconnection_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri
index 27b72a320c..5f3aec1c9a 100644
--- a/src/qml/debugger/debugger.pri
+++ b/src/qml/debugger/debugger.pri
@@ -34,3 +34,10 @@ HEADERS += \
     $$PWD/qqmlabstractprofileradapter_p.h \
     $$PWD/qv4profileradapter_p.h \
     $$PWD/qqmlprofiler_p.h
+
+INCLUDEPATH += $$PWD
+
+!contains(DEFINES, QT_QML_NO_DEBUGGER): static {
+    DEFINES += QML_DEBUGGER_EMBED
+    include(../../plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri)
+}
diff --git a/src/qml/debugger/qqmldebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp
index a2bf19dee7..2d3e54c46a 100644
--- a/src/qml/debugger/qqmldebugserver.cpp
+++ b/src/qml/debugger/qqmldebugserver.cpp
@@ -60,6 +60,10 @@
 #include <private/qobject_p.h>
 #include <private/qcoreapplication_p.h>
 
+#if defined(QT_STATIC) && ! defined(QT_QML_NO_DEBUGGER)
+#include "../../plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h"
+#endif
+
 QT_BEGIN_NAMESPACE
 
 // We can't friend the Q_GLOBAL_STATIC to have the constructor available so we need a little
@@ -291,8 +295,14 @@ void QQmlDebugServerThread::run()
     QQmlDebugServerInstanceWrapper *wrapper = debugServerInstance();
     Q_ASSERT_X(wrapper != 0, Q_FUNC_INFO, "There should always be a debug server available here.");
     QQmlDebugServer *server = &wrapper->m_instance;
+#if defined(QT_STATIC) && ! defined(QT_QML_NO_DEBUGGER)
+    QQmlDebugServerConnection *connection
+            = new QTcpServerConnection;
+    server->d_func()->connection = connection;
+#else
     QQmlDebugServerConnection *connection
             = server->d_func()->loadConnectionPlugin(m_pluginName);
+#endif
     if (connection) {
         connection->setServer(server);
         connection->setPortRange(m_portFrom, m_portTo, m_block, m_hostAddress);