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/qquickborderimage | |
| 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/qquickborderimage')
| -rw-r--r-- | tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp index c02a5c7a87..ce4394cf6f 100644 --- a/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp @@ -131,10 +131,10 @@ void tst_qquickborderimage::imageSource_data() QTest::newRow("local") << testFileUrl("colors.png").toString() << false << ""; QTest::newRow("local not found") << testFileUrl("no-such-file.png").toString() << false - << "file::2:1: QML BorderImage: Cannot open: " + testFileUrl("no-such-file.png").toString(); + << "<Unknown File>:2:1: QML BorderImage: Cannot open: " + testFileUrl("no-such-file.png").toString(); QTest::newRow("remote") << SERVER_ADDR "/colors.png" << true << ""; QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << true - << "file::2:1: QML BorderImage: Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found"; + << "<Unknown File>:2:1: QML BorderImage: Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found"; } void tst_qquickborderimage::imageSource() |