diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-02-24 16:37:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-11 18:31:21 +0100 |
| commit | 90f497ae13b1a772621a24f4f5165fc912166538 (patch) | |
| tree | 744bb5d8eda0d5a641b5211f046efa6338f6fb02 /src/qml/debugger/qqmldebugserver.cpp | |
| parent | 914b72418b7e766026f2679254fcee93fc920866 (diff) | |
qmldebugger: handle static builds correctly
The loading of the qml debugger was hardcoded to dynamically load its
plugins.
Now directly build and instantiate the QQmlDebugServerConnection in
static builds.
Done-with: Kai Koehne <kai.koehne@digia.com>
Change-Id: I38bf0e310caaa6aaa743e3814b0108c6fe7001df
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/qml/debugger/qqmldebugserver.cpp')
| -rw-r--r-- | src/qml/debugger/qqmldebugserver.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
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); |