diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 15:46:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-06 15:46:03 (GMT) |
| commit | 679a545cb805382c97582dffa3fda4dbc438c81f (patch) | |
| tree | f6ea9a9bd36b8636f0c5d5bf956c82a2ea81c391 /tests | |
| parent | a6a8bee86f7e13d49d9115eb33aaee999bd15ad5 (diff) | |
| parent | 6d331b6ee7711cde2bf9adc1a584a45875c07983 (diff) | |
| download | Qt-679a545cb805382c97582dffa3fda4dbc438c81f.zip Qt-679a545cb805382c97582dffa3fda4dbc438c81f.tar.gz Qt-679a545cb805382c97582dffa3fda4dbc438c81f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Designer: Block QEvent::WinIdChange.
QUrl::setUrl should call detach
qkeymapper_x11.cpp: fix compilation with LSB and without XKB
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qurl/tst_qurl.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index 63f9721..4354ffb 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -675,6 +675,14 @@ void tst_QUrl::setUrl() QCOMPARE(url.encodedPath().constData(), "text/javascript,d5%20%3D%20'five%5Cu0027s'%3B"); } + { //check it calls detach + QUrl u1("http://aaa.com"); + QUrl u2 = u1; + u2.setUrl("http://bbb.com"); + QCOMPARE(u1.host(), QString::fromLatin1("aaa.com")); + QCOMPARE(u2.host(), QString::fromLatin1("bbb.com")); + } + /* The tests below are copied from kdelibs/kdecore/tests/kurltest.cpp (an old version of) |