summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-08 02:23:15 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-08 02:23:15 (GMT)
commit2bddf15b87a9e27bfdcbc3aec5d79da49f070c15 (patch)
tree15bfb4b167e2594453ea22b2cde0433197e6e47b /tests/auto
parent8ca64c4ea1484321ebaade018369fe33bcfcb02e (diff)
parent706b0ed0555b708c52e1ac9c9e8cb747a92a23c7 (diff)
downloadQt-2bddf15b87a9e27bfdcbc3aec5d79da49f070c15.zip
Qt-2bddf15b87a9e27bfdcbc3aec5d79da49f070c15.tar.gz
Qt-2bddf15b87a9e27bfdcbc3aec5d79da49f070c15.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: QmlViewer: Remove unused class variables Fixed bug and performance problem in windowsstyle. Restored old flushing behavior in -graphicssystem opengl on desktop. Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs Designer: Block QEvent::WinIdChange. QUrl::setUrl should call detach qkeymapper_x11.cpp: fix compilation with LSB and without XKB
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qurl/tst_qurl.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index c089a59..a00ccf9 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -679,6 +679,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)