diff options
author | David Faure <david.faure@kdab.com> | 2014-07-11 16:15:01 +0200 |
---|---|---|
committer | David Faure <david.faure@kdab.com> | 2014-07-24 15:15:43 +0200 |
commit | aad255f6d5e79f496e93c9e758504a1d2c8a2467 (patch) | |
tree | 02a1b6f1225b985bcd9b42e593203d18d0cfce0a /tests/auto/quick/qquickpositioners | |
parent | a38b0863f88bc89733c213cf6f73abc7ed15bd5a (diff) |
QQmlError::toString: improve handling of empty urls.
"file::2:23: ..." is strange to read. Show "<Unknown File>:2:23: ..." instead,
by treating empty urls (including "file:") as unknown, and by still showing
line and column numbers in such a case.
This change makes it possible for QUrl::fromLocalFile("") to return an
empty url rather than "file:", which this module was relying upon in the tests.
Change-Id: I91918090fd4e0aa9a25dbbb18893a0ce94140e21
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tests/auto/quick/qquickpositioners')
-rw-r--r-- | tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp index e63ff6639e..035735914a 100644 --- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp +++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp @@ -1857,7 +1857,7 @@ void tst_qquickpositioners::test_conflictinganchors() item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(messageHandler.messages().size(), 1); - QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column. Column will not function.")); + QCOMPARE(messageHandler.messages().back(), QString("<Unknown File>:2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column. Column will not function.")); messageHandler.clear(); delete item; @@ -1865,7 +1865,7 @@ void tst_qquickpositioners::test_conflictinganchors() item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(messageHandler.messages().size(), 1); - QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column. Column will not function.")); + QCOMPARE(messageHandler.messages().back(), QString("<Unknown File>:2:1: QML Column: Cannot specify top, bottom, verticalCenter, fill or centerIn anchors for items inside Column. Column will not function.")); messageHandler.clear(); delete item; @@ -1879,7 +1879,7 @@ void tst_qquickpositioners::test_conflictinganchors() item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(messageHandler.messages().size(), 1); - QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row. Row will not function.")); + QCOMPARE(messageHandler.messages().back(), QString("<Unknown File>:2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row. Row will not function.")); messageHandler.clear(); delete item; @@ -1887,7 +1887,7 @@ void tst_qquickpositioners::test_conflictinganchors() item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(messageHandler.messages().size(), 1); - QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row. Row will not function.")); + QCOMPARE(messageHandler.messages().back(), QString("<Unknown File>:2:1: QML Row: Cannot specify left, right, horizontalCenter, fill or centerIn anchors for items inside Row. Row will not function.")); messageHandler.clear(); delete item; @@ -1901,7 +1901,7 @@ void tst_qquickpositioners::test_conflictinganchors() item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(messageHandler.messages().size(), 1); - QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Grid: Cannot specify anchors for items inside Grid. Grid will not function.")); + QCOMPARE(messageHandler.messages().back(), QString("<Unknown File>:2:1: QML Grid: Cannot specify anchors for items inside Grid. Grid will not function.")); messageHandler.clear(); delete item; @@ -1909,7 +1909,7 @@ void tst_qquickpositioners::test_conflictinganchors() item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(messageHandler.messages().size(), 1); - QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Grid: Cannot specify anchors for items inside Grid. Grid will not function.")); + QCOMPARE(messageHandler.messages().back(), QString("<Unknown File>:2:1: QML Grid: Cannot specify anchors for items inside Grid. Grid will not function.")); messageHandler.clear(); delete item; @@ -1917,7 +1917,7 @@ void tst_qquickpositioners::test_conflictinganchors() item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(messageHandler.messages().size(), 1); - QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow. Flow will not function.")); + QCOMPARE(messageHandler.messages().back(), QString("<Unknown File>:2:1: QML Flow: Cannot specify anchors for items inside Flow. Flow will not function.")); messageHandler.clear(); delete item; @@ -1925,7 +1925,7 @@ void tst_qquickpositioners::test_conflictinganchors() item = qobject_cast<QQuickItem*>(component.create()); QVERIFY(item); QCOMPARE(messageHandler.messages().size(), 1); - QCOMPARE(messageHandler.messages().back(), QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow. Flow will not function.")); + QCOMPARE(messageHandler.messages().back(), QString("<Unknown File>:2:1: QML Flow: Cannot specify anchors for items inside Flow. Flow will not function.")); delete item; } |