diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-22 20:13:50 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-22 20:21:19 +0200 |
| commit | abd3b8030cbcc50379578b88ce6019e338ff8597 (patch) | |
| tree | 7a7acb89e594b57180e9823c4ab03dcce66d5b5f /tests/auto/corelib/io/qurl | |
| parent | 5cb581b3b4c3305a0dfebead1ec7049ab6f2ebc4 (diff) | |
| parent | 6f3bb0aafab877c34dea3d9141a9931b5a7914a5 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/widgets/kernel/qwidget_qpa.cpp
src/widgets/widgets.pro
Change-Id: I697eec936c4e1a6c360edc8f0b472e23c0461ecb
Diffstat (limited to 'tests/auto/corelib/io/qurl')
| -rw-r--r-- | tests/auto/corelib/io/qurl/tst_qurl.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp index df090c3de9..28b68dc750 100644 --- a/tests/auto/corelib/io/qurl/tst_qurl.cpp +++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp @@ -1029,6 +1029,13 @@ void tst_QUrl::toString_data() QTest::newRow("underscore") << QString::fromLatin1("http://foo_bar.host.com/rss.php") << uint(QUrl::None) << QString::fromLatin1("http://foo_bar.host.com/rss.php"); + + QTest::newRow("mailto-brackets") << QString::fromLatin1("mailto:test[at]gmail[dot]com") + << uint(QUrl::PrettyDecoded) + << QString::fromLatin1("mailto:test[at]gmail[dot]com"); + QTest::newRow("mailto-query") << QString::fromLatin1("mailto:?to=test@example.com") + << uint(QUrl::PrettyDecoded) + << QString::fromLatin1("mailto:?to=test@example.com"); } void tst_QUrl::toString() |