summaryrefslogtreecommitdiffstats
path: root/tests/auto/qurl
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-01 06:10:49 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-01 06:10:49 (GMT)
commit1b4bb02fcb3da77ddfa6281365ba3210aab9daad (patch)
treeecaab6c64758f41fa9cb5b376b395831a77e6c83 /tests/auto/qurl
parentac6bd40b501c63941a4dfc4c1ba500b0c14f74de (diff)
parentdc1cab966938edc5463f26189607ece134549a22 (diff)
downloadQt-1b4bb02fcb3da77ddfa6281365ba3210aab9daad.zip
Qt-1b4bb02fcb3da77ddfa6281365ba3210aab9daad.tar.gz
Qt-1b4bb02fcb3da77ddfa6281365ba3210aab9daad.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits) Fix build due to missing auto-generated files on dbus example examples/dbus: update remotecontrolledcar example examples/dbus: update dbus-chat adaptor/interface files doc: Fix typo in QEvent::ignore() documentation doc: Fix qmake-manual warn_on/warn_off references Use X/Open LFS extensions for 64-bit support on directory iteration nano-optimizations code cleanup and styling fixes QDirPrivate: remove unused q_ptr and Q_DECLARE_PUBLIC QDir: clear internal file lists cache early QDirPrivate::setPath: always initialize the file engine optimize QDir::cd() QDirPrivate::Data: remove needless clear()-s in constructors QDir::cleanPath: strip trailing slash for "/:/" on non-win platforms QDir::entry(Info)List(): really use cached data Fix QDir::operator[] documentation Move avkon component transparency check to app initialization. Fix for symbian dialog background transparency. Assistant docs: Fix link. QtHelp docs: Fix illegal namespace name. ...
Diffstat (limited to 'tests/auto/qurl')
-rw-r--r--tests/auto/qurl/tst_qurl.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index ecd6f09..33812fe 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -90,7 +90,6 @@ public slots:
private slots:
void getSetCheck();
void constructing();
- void isDetached();
void assignment();
void comparison();
void copying();
@@ -319,25 +318,6 @@ void tst_QUrl::constructing()
QVERIFY(!buildUNC.isEmpty());
}
-void tst_QUrl::isDetached()
-{
- QUrl url;
- QVERIFY(!url.isDetached());
-
- url = "http://qt.nokia.com/";
- QVERIFY(url.isDetached());
-
- url.clear();
- QVERIFY(!url.isDetached());
-
- url.setHost("qt.nokia.com");
- QVERIFY(url.isDetached());
-
- QUrl url2 = url;
- QVERIFY(!url.isDetached());
- QVERIFY(!url2.isDetached());
-}
-
void tst_QUrl::assignment()
{
QUrl url("http://qt.nokia.com/");