diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-06-28 09:42:36 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-28 10:23:08 +0200 |
| commit | 0a1eb3710885c6d45b0d21498156f741d117b4cd (patch) | |
| tree | 0862b9fe636910bc122fed8d36a2019a64c408ce /src/plugins | |
| parent | aa6bfc3862abd426d09879ed98b63930dea61929 (diff) | |
Rename qmldbg_tcp plugin to avoid conflict with qtdeclarative's copy
... and compile the plugin regardless of whether qtdeclarative has
been qmake'd.
Change-Id: I704214e07a92eff6630d94858eb6898a399d6fa2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro (renamed from src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro) | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.cpp (renamed from src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp) | 0 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h (renamed from src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h) | 0 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.json (renamed from src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json) | 0 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmltooling.pro | 4 |
5 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro index a224792d..ea52c063 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro @@ -1,4 +1,4 @@ -TARGET = qmldbg_tcp +TARGET = qmldbg_tcp_qtquick1 QT += quick1 quick1-private network load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.cpp index 2df31994..2df31994 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.cpp diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h index a5cda10b..a5cda10b 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.h diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.json index 0967ef42..0967ef42 100644 --- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qtcpserverconnection.json diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro index e495c81e..274073e8 100644 --- a/src/plugins/qmltooling/qmltooling.pro +++ b/src/plugins/qmltooling/qmltooling.pro @@ -1,5 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = qmldbg_inspector - -!contains(QT_CONFIG, qml): SUBDIRS += qmldbg_tcp +SUBDIRS = qmldbg_inspector qmldbg_tcp_qtquick1 |