diff options
| author | David Faure <david.faure@kdab.com> | 2014-07-25 18:29:19 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2014-07-26 00:46:13 +0200 |
| commit | 8c80dd6a9893c6e323ae69b651efd7b629b2714c (patch) | |
| tree | 843aa76e5125aa082419140d19e121bbb019ebf3 /tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | |
| parent | 302687f21c99643a2dd1930a19fde66ba725661e (diff) | |
QDeclarativeError::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: Id6d8aaa73673283cb65cbd1316dca77f859a3f8f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 7b0c650e..ebdbee39 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -2473,19 +2473,19 @@ void tst_qdeclarativetextedit::testQtQuick11Attributes_data() QTest::addColumn<QString>("error"); QTest::newRow("canPaste") << "property bool foo: canPaste" - << "<Unknown File>: ReferenceError: Can't find variable: canPaste" + << "<Unknown File>:1: ReferenceError: Can't find variable: canPaste" << ""; QTest::newRow("lineCount") << "property int foo: lineCount" - << "<Unknown File>: ReferenceError: Can't find variable: lineCount" + << "<Unknown File>:1: ReferenceError: Can't find variable: lineCount" << ""; QTest::newRow("moveCursorSelection") << "Component.onCompleted: moveCursorSelection(0, TextEdit.SelectCharacters)" - << "<Unknown File>: ReferenceError: Can't find variable: moveCursorSelection" + << "<Unknown File>:1: ReferenceError: Can't find variable: moveCursorSelection" << ""; QTest::newRow("deselect") << "Component.onCompleted: deselect()" - << "<Unknown File>: ReferenceError: Can't find variable: deselect" + << "<Unknown File>:1: ReferenceError: Can't find variable: deselect" << ""; QTest::newRow("onLinkActivated") << "onLinkActivated: {}" |