diff options
| author | Roland Wolf <ext-roland.wolf@nokia.com> | 2010-09-06 09:59:32 (GMT) |
|---|---|---|
| committer | Roland Wolf <ext-roland.wolf@nokia.com> | 2010-09-06 09:59:32 (GMT) |
| commit | 03b787cdadb966898c86a06747deb39e2f7dae2f (patch) | |
| tree | 188d10557683fb95defc966829ff3d14bc404e37 /tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | |
| parent | 5180a674358d5b295e5f7e01f28649176ec0d33a (diff) | |
| parent | fded09d4e2983d7eed82c9fa5b678f70074473ba (diff) | |
| download | Qt-03b787cdadb966898c86a06747deb39e2f7dae2f.zip Qt-03b787cdadb966898c86a06747deb39e2f7dae2f.tar.gz Qt-03b787cdadb966898c86a06747deb39e2f7dae2f.tar.bz2 | |
Merge remote branch 'upstream/4.7' into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 56a3121..84f4230 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -777,7 +777,7 @@ void tst_qdeclarativetextedit::delegateLoading_data() // import installed QTest::newRow("pass") << "cursorHttpTestPass.qml" << ""; - QTest::newRow("fail1") << "cursorHttpTestFail1.qml" << "<Unknown File>: Network error for URL http://localhost:42332/FailItem.qml "; + QTest::newRow("fail1") << "cursorHttpTestFail1.qml" << "http://localhost:42332/FailItem.qml: Remote host closed the connection "; QTest::newRow("fail2") << "cursorHttpTestFail2.qml" << "http://localhost:42332/ErrItem.qml:4:5: Fungus is not a type "; } |