diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2012-03-07 14:53:24 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-07 16:21:11 +0100 |
commit | 3f9b58c0890a4263730e2c06b46e7a69d4bfb62d (patch) | |
tree | 2f3419ed2035540f9ea4fa00b0b70057c0564698 /tests | |
parent | 51493a03ba60f60b735eb25f2dc3bedd1d8ed592 (diff) |
QML Debugger: Change prefix of warnings
Since we've been changing from QtDeclarativeDebugServer to
QQmlDebugServer anyway, we might as well change it to the more
readable "QML Debugger:" prefix.
Change-Id: I852577233d7cdb1f57adc43ec1b85a14d212574d
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Diffstat (limited to 'tests')
4 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp index 2891076af6..b18f30ffb3 100644 --- a/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp +++ b/tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp @@ -71,7 +71,7 @@ private slots: void tst_QQmlDebugClient::initTestCase() { - const QString waitingMsg = QString("QQmlDebugServer: Waiting for connection on port %1...").arg(PORT); + const QString waitingMsg = QString("QML Debugger: Waiting for connection on port %1...").arg(PORT); QTest::ignoreMessage(QtWarningMsg, waitingMsg.toAscii().constData()); new QQmlEngine(this); @@ -80,7 +80,7 @@ void tst_QQmlDebugClient::initTestCase() QQmlDebugTestClient client("tst_QQmlDebugClient::handshake()", m_conn); QQmlDebugTestService service("tst_QQmlDebugClient::handshake()"); - QTest::ignoreMessage(QtWarningMsg, "QQmlDebugServer: Connection established"); + QTest::ignoreMessage(QtWarningMsg, "QML Debugger: Connection established."); for (int i = 0; i < 50; ++i) { // try for 5 seconds ... m_conn->connectToHost("127.0.0.1", PORT); @@ -150,7 +150,7 @@ void tst_QQmlDebugClient::parallelConnect() { QQmlDebugConnection connection2; - QTest::ignoreMessage(QtWarningMsg, "QQmlDebugServer: Another client is already connected"); + QTest::ignoreMessage(QtWarningMsg, "QML Debugger: Another client is already connected."); // will connect & immediately disconnect connection2.connectToHost("127.0.0.1", PORT); QVERIFY(connection2.waitForConnected()); @@ -172,7 +172,7 @@ void tst_QQmlDebugClient::sequentialConnect() QTest::qWait(100); connection2.connectToHost("127.0.0.1", PORT); - QTest::ignoreMessage(QtWarningMsg, "QQmlDebugServer: Connection established"); + QTest::ignoreMessage(QtWarningMsg, "QML Debugger: Connection established."); QVERIFY(connection2.waitForConnected()); QVERIFY(connection2.isConnected()); QTRY_VERIFY(client2.state() == QQmlDebugClient::Enabled); diff --git a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp index 5af38c2af0..3699530e00 100644 --- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp +++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp @@ -76,14 +76,14 @@ private slots: void tst_QQmlDebugService::initTestCase() { - const QString waitingMsg = QString("QQmlDebugServer: Waiting for connection on port %1...").arg(PORT); + const QString waitingMsg = QString("QML Debugger: Waiting for connection on port %1...").arg(PORT); QTest::ignoreMessage(QtWarningMsg, waitingMsg.toAscii().constData()); new QQmlEngine(this); m_conn = new QQmlDebugConnection(this); - QTest::ignoreMessage(QtWarningMsg, "QQmlDebugServer: Connection established"); + QTest::ignoreMessage(QtWarningMsg, "QML Debugger: Connection established."); for (int i = 0; i < 50; ++i) { // try for 5 seconds ... m_conn->connectToHost("127.0.0.1", PORT); diff --git a/tests/auto/qml/debugger/qqmlenginedebug/tst_qqmlenginedebug.cpp b/tests/auto/qml/debugger/qqmlenginedebug/tst_qqmlenginedebug.cpp index 21ed2f40ff..df8109abfb 100644 --- a/tests/auto/qml/debugger/qqmlenginedebug/tst_qqmlenginedebug.cpp +++ b/tests/auto/qml/debugger/qqmlenginedebug/tst_qqmlenginedebug.cpp @@ -301,7 +301,7 @@ void tst_QQmlEngineDebug::initTestCase() qRegisterMetaType<QQmlDebugWatch::State>(); qmlRegisterType<NonScriptProperty>("Test", 1, 0, "NonScriptPropertyElement"); - QTest::ignoreMessage(QtWarningMsg, "QQmlDebugServer: Waiting for connection on port 3768..."); + QTest::ignoreMessage(QtWarningMsg, "QML Debugger: Waiting for connection on port 3768..."); m_engine = new QQmlEngine(this); QList<QByteArray> qml; @@ -386,7 +386,7 @@ void tst_QQmlEngineDebug::initTestCase() m_conn = new QQmlDebugConnection(this); m_conn->connectToHost("127.0.0.1", 3768); - QTest::ignoreMessage(QtWarningMsg, "QQmlDebugServer: Connection established"); + QTest::ignoreMessage(QtWarningMsg, "QML Debugger: Connection established."); bool ok = m_conn->waitForConnected(); QVERIFY(ok); QTRY_VERIFY(QQmlDebugService::hasDebuggingClient()); diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp index 8ed64d3a5d..a3d3dce644 100644 --- a/tests/auto/qml/debugger/shared/debugutil.cpp +++ b/tests/auto/qml/debugger/shared/debugutil.cpp @@ -173,15 +173,15 @@ void QQmlDebugProcess::processAppOutput() const QString line = m_outputBuffer.left(nlIndex); m_outputBuffer = m_outputBuffer.right(m_outputBuffer.size() - nlIndex - 1); - if (line.startsWith("Qml debugging is enabled")) // ignore + if (line.startsWith("QML debugging is enabled")) // ignore continue; - if (line.startsWith("QQmlDebugServer:")) { + if (line.startsWith("QML Debugger:")) { if (line.contains("Waiting for connection ")) { m_started = true; m_eventLoop.quit(); continue; } - if (line.contains("Connection established")) { + if (line.contains("Connection established.")) { continue; } } |