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/declarative/debugger | |
| 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/declarative/debugger')
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index c0fd7984..ab7f308b 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -190,7 +190,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) { int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(',')); port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok); - pluginName = QLatin1String("qmldbg_tcp"); + pluginName = QLatin1String("qmldbg_tcp_qtquick1"); } else if (appD->qmljsDebugArgumentsString().contains(QLatin1String("ost"))) { pluginName = QLatin1String("qmldbg_ost"); ok = true; |