summaryrefslogtreecommitdiffstats
path: root/src/declarative/debugger
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-04-21 11:12:18 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-04-21 11:12:18 (GMT)
commit1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd (patch)
tree066bdf995360981ebb645383b93866133c1ca000 /src/declarative/debugger
parenta334ad303d2763cd53fc5bd62945d08d3555b8a7 (diff)
parent43bce78bd5a41115ab5a541243cc3edcecd2904e (diff)
downloadQt-1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd.zip
Qt-1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd.tar.gz
Qt-1b95c4e6502ede5a980aaf5a2ed9dad283b3eadd.tar.bz2
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.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
index 75e9a09..6f46354 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());
}