diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-01-29 12:05:28 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-03 14:16:37 +0000 |
commit | 2aec854665f62e217714606d1651cca5708b82d9 (patch) | |
tree | a737e7b3ba86e783ff0f21528c03550438ee0986 /tests/auto/qml/qqmlinfo | |
parent | 5d4df794665914d5452213f0f69b9aad151ddbf4 (diff) |
Fix autotest not to rely on broken operator<<(QDebug, QUrl) behavior
QmlInfo does call nospace() in the constructor. However, the current
streaming operator for QDebug permanently resets this to space(),
which the autotest relies on ...
Move QUrl to the end of the chain so that the broken behavior of
QUrl isn't checked anymore. This allows us to fix it in qtbase ...
Change-Id: I365df3479a2724f69e768c23c0844f10c34b71be
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'tests/auto/qml/qqmlinfo')
-rw-r--r-- | tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp b/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp index 4655c6f4c3..66e6787261 100644 --- a/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp +++ b/tests/auto/qml/qqmlinfo/tst_qqmlinfo.cpp @@ -191,21 +191,20 @@ void tst_qqmlinfo::types() void tst_qqmlinfo::chaining() { - //### should more of these be automatically inserting spaces? QString str("Hello World"); QStringRef ref(&str, 6, 5); - QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false 1.1 1.2 15 hello 'b' QUrl(\"http://www.qt-project.org\") World \"Qt\" true Quick "); + QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: false 1.1 1.2 15 hello 'b' World \"Qt\" true 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") - << bool(true) - << QString ("Quick"); + << ref << ' ' + << QByteArray("Qt") << ' ' + << bool(true) << ' ' + << QString ("Quick") << ' ' + << QUrl("http://www.qt-project.org"); } QTEST_MAIN(tst_qqmlinfo) |