diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-01-02 09:28:35 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2012-01-02 09:28:35 (GMT) |
| commit | 3bbfcb2e9b75b159da308373f24d5b9869162a9a (patch) | |
| tree | a09c949950e89585e787d522db0d0cce2def20da /tests/auto | |
| parent | 2cfbc2b874ebec52ee76adc60b51dca138827d8c (diff) | |
| parent | 2721d69e64e7bd411c1ff51ce82ebafa7dbf3314 (diff) | |
| download | Qt-3bbfcb2e9b75b159da308373f24d5b9869162a9a.zip Qt-3bbfcb2e9b75b159da308373f24d5b9869162a9a.tar.gz Qt-3bbfcb2e9b75b159da308373f24d5b9869162a9a.tar.bz2 | |
Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging
Diffstat (limited to 'tests/auto')
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp index be9b402..3c6ba9b 100644 --- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp +++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp @@ -294,7 +294,7 @@ void tst_QDeclarativeDebug::initTestCase() qRegisterMetaType<QDeclarativeDebugWatch::State>(); qmlRegisterType<NonScriptProperty>("Test", 1, 0, "NonScriptPropertyElement"); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768..."); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Waiting for connection on port 3768..."); m_engine = new QDeclarativeEngine(this); QList<QByteArray> qml; @@ -375,7 +375,7 @@ void tst_QDeclarativeDebug::initTestCase() m_conn = new QDeclarativeDebugConnection(this); m_conn->connectToHost("127.0.0.1", 3768); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established"); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Connection established"); bool ok = m_conn->waitForConnected(); QVERIFY(ok); QTRY_VERIFY(QDeclarativeDebugService::hasDebuggingClient()); diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp index 4846d67..eb673bf 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp +++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp @@ -69,7 +69,7 @@ private slots: void tst_QDeclarativeDebugClient::initTestCase() { - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 13770..."); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Waiting for connection on port 13770..."); new QDeclarativeEngine(this); m_conn = new QDeclarativeDebugConnection(this); @@ -79,7 +79,7 @@ void tst_QDeclarativeDebugClient::initTestCase() m_conn->connectToHost("127.0.0.1", 13770); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established"); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Connection established"); bool ok = m_conn->waitForConnected(); QVERIFY(ok); diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 85d459b..62fb5ad 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -73,13 +73,13 @@ private slots: void tst_QDeclarativeDebugService::initTestCase() { - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 13769..."); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Waiting for connection on port 13769..."); new QDeclarativeEngine(this); m_conn = new QDeclarativeDebugConnection(this); m_conn->connectToHost("127.0.0.1", 13769); - QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established"); + QTest::ignoreMessage(QtDebugMsg, "QDeclarativeDebugServer: Connection established"); bool ok = m_conn->waitForConnected(); QVERIFY(ok); |