aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-10-30 16:59:04 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-12 10:52:27 +0100
commit3db49f7b9fb9c7ba51ceec769e3a729686f7698e (patch)
treee4f22b662cb470c1358ed00bc1ae70150f98648f /tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
parenta46312b3b5f97802b8a74e53a86ce4a57df320ef (diff)
Fix autotests expecting a trailing whitespace for qDebug stream
The behavior of QDebug was fixed in qtbase. Update autotests accordingly. Change-Id: I36c442fb772ba35b71b6ab50b5f77a3f9c1463e3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp')
-rw-r--r--tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
index f29c3a282a..9d62aa2984 100644
--- a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
+++ b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
@@ -500,7 +500,7 @@ void tst_qqmlinstruction::dump()
<< "8\t\tSTORE_INTEGER\t\t5\t9"
<< "9\t\tSTORE_BOOL\t\t6\ttrue"
<< "10\t\tSTORE_STRING\t\t7\t1\t\t\"Test String\""
- << "11\t\tSTORE_URL\t\t8\t0\t\tQUrl(\"http://www.qt-project.org\") "
+ << "11\t\tSTORE_URL\t\t8\t0\t\tQUrl(\"http://www.qt-project.org\")"
<< "12\t\tSTORE_COLOR\t\t9\t\t\t\"ff00ff00\""
<< "13\t\tSTORE_DATE\t\t10\t9"
<< "14\t\tSTORE_TIME\t\t11"
@@ -552,7 +552,6 @@ void tst_qqmlinstruction::dump()
data->dumpInstructions();
- QSKIP("Disable test temporarily until codereview.qt-project.org/#change,69731 integrated");
const int messageCount = messageHandler.messages().count();
QCOMPARE(messageCount, expect.count());
for (int ii = 0; ii < messageCount; ++ii) {