diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 08:39:02 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-06 08:39:02 (GMT) |
| commit | 24c89f6d1c090ab670d4f883d06cd0413c2ecc65 (patch) | |
| tree | 91ff703829c3b5709adbd37f33ec51c061a273fd /src/declarative/debugger/qdeclarativedebugservice.cpp | |
| parent | 371b528ffd53cc28ca621739d6c3fc33a1fb9fa0 (diff) | |
| parent | cbd26879cb942a2c4ee7ccd919ee18a45b5b87bb (diff) | |
| download | Qt-24c89f6d1c090ab670d4f883d06cd0413c2ecc65.zip Qt-24c89f6d1c090ab670d4f883d06cd0413c2ecc65.tar.gz Qt-24c89f6d1c090ab670d4f883d06cd0413c2ecc65.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative/debugger/qdeclarativedebugservice.cpp')
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugservice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp index d2ef00d..b98cd5d 100644 --- a/src/declarative/debugger/qdeclarativedebugservice.cpp +++ b/src/declarative/debugger/qdeclarativedebugservice.cpp @@ -219,8 +219,8 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance() server->waitForConnection(); } } else { - qWarning(QString("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " - "Format is -qmljsdebugger=port:<port>[,block]").arg( + qWarning(QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". " + "Format is -qmljsdebugger=port:<port>[,block]").arg( appD->qmljsDebugArguments).toAscii().constData()); } } |