diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 07:57:35 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 07:57:35 (GMT) |
commit | 70da5d7842289f79589a465a8d999493cff5cb50 (patch) | |
tree | 23de886d0ac5d744c4c195513269ec8b0b32485c /tests | |
parent | 2c0c3a213d44ad53023a507e19d18d1e5d359aec (diff) | |
parent | f4785aff2e80e9b16379cebfd944d7b24260ecd9 (diff) | |
download | Qt-70da5d7842289f79589a465a8d999493cff5cb50.zip Qt-70da5d7842289f79589a465a8d999493cff5cb50.tar.gz Qt-70da5d7842289f79589a465a8d999493cff5cb50.tar.bz2 |
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:
Repaint when text color changes
Fix type punning warnings from gcc
Slightly improved tst_qmlvisual output
More detail when the process crashes in tst_qmlvisual.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp index 18fbfca..ef0d4dc 100644 --- a/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp +++ b/tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp @@ -147,9 +147,11 @@ void tst_qmlvisual::visual() QProcess p; p.start(qmlruntime, arguments); - QVERIFY(p.waitForFinished()); + bool finished = p.waitForFinished(); + QByteArray output = p.readAllStandardOutput() + p.readAllStandardError(); + QVERIFY2(finished, output.data()); if (p.exitCode() != 0) - qDebug() << p.readAllStandardError(); + qDebug() << output; QCOMPARE(p.exitStatus(), QProcess::NormalExit); QCOMPARE(p.exitCode(), 0); } |