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/plugins | |
| parent | 914b72418b7e766026f2679254fcee93fc920866 (diff) | |
| download | qtdeclarative-90f497ae13b1a772621a24f4f5165fc912166538.tar.gz qtdeclarative-90f497ae13b1a772621a24f4f5165fc912166538.tar.bz2 qtdeclarative-90f497ae13b1a772621a24f4f5165fc912166538.zip | |
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/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri | 14 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro | 14 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h | 2 |
3 files changed, 17 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 000000000..4b78707c3 --- /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 bd2b4bd52..e9dba5fda 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 525ed50e5..b75ae47b9 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 |