summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-21 13:54:51 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-21 13:54:51 +1000
commit5ec9501cd50d4094bf00ca81c75b7c8b763501ee (patch)
tree206b4c511e5bf8b4c3468a116f6791962f19d12c
parentc0b919de00def0ebbe478205285a9711e2a55159 (diff)
parent92062a9af1dea35b9bdd781ee087755168ac1e77 (diff)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeDebug: Fix typo in warning
-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 18258f5858..7fa5a62abc 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());
}