summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-02-10 13:37:15 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2011-02-14 14:28:36 (GMT)
commit637b89583c397a772ab4f0a8ad0a484ca062eaeb (patch)
tree065dedfda90438f845ee51ce4f913653b7734c81 /tools
parentea4f5ff4aaf53fba3d38b44e31e320224ffecb84 (diff)
downloadQt-637b89583c397a772ab4f0a8ad0a484ca062eaeb.zip
Qt-637b89583c397a772ab4f0a8ad0a484ca062eaeb.tar.gz
Qt-637b89583c397a772ab4f0a8ad0a484ca062eaeb.tar.bz2
Rename 'plugins\qmldebugging' (work around qmake issues)
On Windows, qmake places the tcpserver.dll in a 'plugins\qmlreleaseging' folder, which broke remote debugging of QtDeclarative completely. New name 'qmltooling' while being not so specific, avoids the use of 'debug' in the folder name. Task-number: QTBUG-17360 Reviewed-by: Martin Jones (cherry picked from commit 2855782a45b08aedbed960125514fdd9663ff1c8)
Diffstat (limited to 'tools')
-rw-r--r--tools/qml/qml.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index 5d6192d..b1d56ea 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -39,8 +39,8 @@ symbian {
TARGET.CAPABILITY = NetworkServices ReadUserData
# Deploy plugin for remote debugging
- qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmldebugging/tcpserver$${QT_LIBINFIX}.dll
- qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmldebugging
+ qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/tcpserver$${QT_LIBINFIX}.dll
+ qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmltooling
DEPLOYMENT += qmldebuggingplugin
}
mac {