diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-21 13:12:18 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-21 13:12:18 +0200 |
| commit | 1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd (patch) | |
| tree | 066bdf995360981ebb645383b93866133c1ca000 /src/declarative/debugger | |
| parent | a334ad303d2763cd53fc5bd62945d08d3555b8a7 (diff) | |
| parent | 43bce78bd5a41115ab5a541243cc3edcecd2904e (diff) | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/plugins/qmltooling/qmldbg_ost/qostdevice.h
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 75e9a095f4..6f46354a49 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -202,7 +202,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() connection->setServer(server); connection->setPort(port, block); } else { - qWarning() << QString::fromAscii("QDeclarativeDebugServer: Ignoring\"-qmljsdebugger=%1\". " + qWarning() << QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " "Remote debugger plugin has not been found.").arg(appD->qmljsDebugArgumentsString()); } |