diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 19:12:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 19:12:59 (GMT) |
| commit | 30f2580a7c1486f8239ac1c362f7ac485f5321f3 (patch) | |
| tree | 5a2dc82e7ae8a2848621fbfcfec6bea976396414 /tests | |
| parent | 04f5b7c80917ebbe56f3ceadda517771238f3800 (diff) | |
| parent | 8cebe2a951a765c16213e5f84ac0db8101d8ea41 (diff) | |
| download | Qt-30f2580a7c1486f8239ac1c362f7ac485f5321f3.zip Qt-30f2580a7c1486f8239ac1c362f7ac485f5321f3.tar.gz Qt-30f2580a7c1486f8239ac1c362f7ac485f5321f3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (33 commits)
make shadow builds not write into the source dir
Fix failing tst_qmdisubwindow test after 71a3b1a0d3
Doc: update the documentation of QUrl about HTML Form encoding
search translator comments
Install translators earlier in assistant
Fix compilation on ARM: don't include kernel headers
Fix compilation of qmake with MSVC
Doc: Updating known-issues page.
Recognize @, #, $ and ` as word separators
rebuild configure.exe
Fix dependencies so JOM will handle parallellization properly
Symbian: Disable IPv6 for now
Doc: Fixed namespaced Qt build breakage in the model/view tutorial.
Doc: Fixing links on index page and corecting HTML in the template.
Accept empty authority segments in QUrl as different from not-present
Doc: Adds line about non-support for Webkit on Solaris
protect nil dictionary from release.
Fix potential KERN-EXEC 0 on Symbian.
Ukrainian translation updated
Fix remote crash in delivering D-Bus calls with too few arguments
...
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qurl/tst_qurl.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 820e32d..370bd13 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -194,6 +194,7 @@ private slots: void task_199967(); void task_240612(); void taskQTBUG_6962(); + void taskQTBUG_8701(); #ifdef QT3_SUPPORT void dirPath(); @@ -3912,5 +3913,17 @@ void tst_QUrl::taskQTBUG_6962() QCOMPARE(url.authority(), QString()); } +void tst_QUrl::taskQTBUG_8701() +{ + //bug 8701: foo:///bar mangled to foo:/bar + QString foo_triple_bar("foo:///bar"), foo_uni_bar("foo:/bar"); + + QCOMPARE(foo_triple_bar, QUrl(foo_triple_bar).toString()); + QCOMPARE(foo_uni_bar, QUrl(foo_uni_bar).toString()); + + QCOMPARE(foo_triple_bar, QUrl(foo_triple_bar, QUrl::StrictMode).toString()); // fails + QCOMPARE(foo_uni_bar, QUrl(foo_uni_bar, QUrl::StrictMode).toString()); +} + QTEST_MAIN(tst_QUrl) #include "tst_qurl.moc" |