summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-03-30 14:52:21 +0200
committerKai Koehne <kai.koehne@nokia.com>2011-04-14 14:52:27 +0200
commit9ed28d039da0f3745ca84203efa92203f31e97e7 (patch)
treec9db6ca765d5bed773492a1bb1e3bede0e0f35a7
parentddd633f2f4234aae353cd0239974a3a997abc71e (diff)
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
Make the name less ambiguous, especially on Symbian were all .dlls end up in sys\bin. Reviewed-by: Pawel Polanski
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro (renamed from src/plugins/qmltooling/tcpserver/tcpserver.pro)4
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp (renamed from src/plugins/qmltooling/tcpserver/qtcpserverconnection.cpp)0
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h (renamed from src/plugins/qmltooling/tcpserver/qtcpserverconnection.h)0
-rw-r--r--src/plugins/qmltooling/qmltooling.pro3
-rw-r--r--tools/qml/qml.pro2
5 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/qmltooling/tcpserver/tcpserver.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index f4f2666b25..e8ab962da8 100644
--- a/src/plugins/qmltooling/tcpserver/tcpserver.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -1,4 +1,4 @@
-TARGET = tcpserver
+TARGET = qmldbg_tcp
QT += declarative network
include(../../qpluginbase.pri)
@@ -15,4 +15,4 @@ HEADERS += \
target.path += $$[QT_INSTALL_PLUGINS]/qmltooling
INSTALLS += target
-symbian:TARGET.UID3=0x20031E90 \ No newline at end of file
+symbian:TARGET.UID3=0x20031E90
diff --git a/src/plugins/qmltooling/tcpserver/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
index 7db0db3ef0..7db0db3ef0 100644
--- a/src/plugins/qmltooling/tcpserver/qtcpserverconnection.cpp
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
diff --git a/src/plugins/qmltooling/tcpserver/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
index a6e17e69b0..a6e17e69b0 100644
--- a/src/plugins/qmltooling/tcpserver/qtcpserverconnection.h
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro
index 01cf1a9934..2442dc0f5b 100644
--- a/src/plugins/qmltooling/qmltooling.pro
+++ b/src/plugins/qmltooling/qmltooling.pro
@@ -1,4 +1,3 @@
TEMPLATE = subdirs
-SUBDIRS = tcpserver
-
+SUBDIRS = qmldbg_tcp
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index b1d56ea29e..bdc4b10b12 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -39,7 +39,7 @@ symbian {
TARGET.CAPABILITY = NetworkServices ReadUserData
# Deploy plugin for remote debugging
- qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/tcpserver$${QT_LIBINFIX}.dll
+ qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/qmldbgtcp$${QT_LIBINFIX}.dll
qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmltooling
DEPLOYMENT += qmldebuggingplugin
}