From feb212e1e5f64111ed061b474bb2e6b8c3886acb Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 14 May 2012 14:48:23 +0200 Subject: QUrl: a url with a fragment or query, and one without, are different. Fix operator== and operator< so that a URL with an empty fragment or query, is not treated as equal to a URL without any fragment or query. This restores the Qt4 behavior on this particular issue. Change-Id: Ie989f37353fb13c791b1d558d638d2e8a5b5d1b8 Reviewed-by: Thiago Macieira --- tests/auto/corelib/io/qurl/tst_qurl.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/auto') diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp index 38b9dc3198..48ff34ad56 100644 --- a/tests/auto/corelib/io/qurl/tst_qurl.cpp +++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp @@ -307,6 +307,8 @@ void tst_QUrl::comparison2_data() QTest::newRow("scheme-null") << QUrl("x:") << QUrl() << 1; QTest::newRow("samescheme") << QUrl("x:") << QUrl("x:") << 0; + QTest::newRow("no-fragment-empty-fragment") << QUrl("http://kde.org/dir/") << QUrl("http://kde.org/dir/#") << -1; + QTest::newRow("no-query-empty-query") << QUrl("http://kde.org/dir/") << QUrl("http://kde.org/dir/?") << -1; // the following three are by choice // the order could be the opposite and it would still be correct -- cgit v1.2.3