Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging

[profile/ivi/qtbase.git] / tests / auto / qurl / tst_qurl.cpp

diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index 85aae1f..9ff5a6d 100644 (file)
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -201,10 +201,6 @@ private slots:
     void task_240612();
     void taskQTBUG_6962();
     void taskQTBUG_8701();
-
-#ifdef QT3_SUPPORT
-    void dirPath();
-#endif
 };
 
 // Testing get/set functions
@@ -3936,13 +3932,6 @@ void tst_QUrl::task_240612()
     QCOMPARE(url.toEncoded().constData(), "//example.com/test.txt");
 }
 
-#ifdef QT3_SUPPORT
-void tst_QUrl::dirPath()
-{
-    QCOMPARE(QUrl("http://www.vg.no/test/file.txt").dirPath(), QString("/test"));
-}
-#endif
-
 void tst_QUrl::resolvedWithAbsoluteSchemes() const
 {
     QFETCH(QUrl, base);