From 4b4c6a984b2bcdfcb5a77a024e48072a7aa854ec Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 13 Feb 2015 09:00:35 +0100 Subject: Fix autotest to not rely on broken operator<<(QDebug, QUrl) behavior QmlInfo does call nospace() in the constructor. However, the streaming operator for QDebug di permanently reset this to space(), which the autotest relies on. This got fixed in qtbase change 868201155fd, letting this autotest fail. Move QUrl to the end of the chain so that the broken behavior of QUrl isn't checked anymore. This is a cherry-pick of change 2aec854665f62e2177 in qtdeclarative. Change-Id: I40f775749392e1c7516b9316706976862025f806 Reviewed-by: J-P Nurmi --- .../declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp index 88bfc455..35e16fc5 100644 --- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp +++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp @@ -166,20 +166,19 @@ void tst_qdeclarativeinfo::types() void tst_qdeclarativeinfo::chaining() { - //### should more of these be automatically inserting spaces? QString str("Hello World"); QStringRef ref(&str, 6, 5); - QTest::ignoreMessage(QtWarningMsg, ": false 1.1 1.2 15 hello 'b' QUrl(\"http://www.qt-project.org\") World \"Qt\" Quick "); + QTest::ignoreMessage(QtWarningMsg, ": false 1.1 1.2 15 hello 'b' World \"Qt\" Quick QUrl(\"http://www.qt-project.org\") "); qmlInfo(0) << false << ' ' << 1.1 << ' ' << 1.2f << ' ' << 15 << ' ' << QLatin1String("hello") << ' ' << QChar('b') << ' ' - << QUrl("http://www.qt-project.org") - << ref - << QByteArray("Qt") - << QString ("Quick"); + << ref << ' ' + << QByteArray("Qt") << ' ' + << QString ("Quick") << ' ' + << QUrl("http://www.qt-project.org"); } QTEST_MAIN(tst_qdeclarativeinfo) -- cgit v1.2.3