diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 20:05:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 20:05:18 (GMT) |
| commit | 7e423cbaba0eb0a7d1e7c81b673149ba59901aab (patch) | |
| tree | 90fc6cb660e99575f31ab234788cd1869e2d8e39 /src/declarative/debugger | |
| parent | 6f44e508d421f69f6f61db567c29aa3eb4828f96 (diff) | |
| parent | 591807899deb3fc479bd32722756f74b899977d5 (diff) | |
| download | Qt-7e423cbaba0eb0a7d1e7c81b673149ba59901aab.zip Qt-7e423cbaba0eb0a7d1e7c81b673149ba59901aab.tar.gz Qt-7e423cbaba0eb0a7d1e7c81b673149ba59901aab.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/declarative/debugger')
| -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()); } } |