From c1d65d996bd97ed8045d29ad0af9865d896a1131 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 1 Jul 2013 19:51:14 +0200 Subject: [PATCH] Revert "Fix QUrl::topLevelDomain(QUrl::FullyDecoded)" This reverts commit e3fa266623b08e837cb4ccc7fe59da243d03dd27 That commit applied a change at the wrong place in the code. Change-Id: I21e3045a3af14ad2f90c5fe338815c35a2d27ae6 Reviewed-by: Thiago Macieira Reviewed-by: David Faure (KDE) --- src/corelib/io/qurlidna.cpp | 3 +-- tests/auto/corelib/io/qurl/tst_qurl.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp index 619ab589a4..70db9e09eb 100644 --- a/src/corelib/io/qurlidna.cpp +++ b/src/corelib/io/qurlidna.cpp @@ -2479,8 +2479,7 @@ QString qt_ACE_do(const QString &domain, AceOperation op) if (labelLength == 0) { if (idx == domain.length()) break; - if (idx > 0) - return QString(); // two delimiters in a row -- empty label not allowed + return QString(); // two delimiters in a row -- empty label not allowed } // RFC 3490 says, about the ToASCII operation: diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp index 23f245a5ae..2a79a6963e 100644 --- a/tests/auto/corelib/io/qurl/tst_qurl.cpp +++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp @@ -2863,8 +2863,7 @@ void tst_QUrl::effectiveTLDs() { QFETCH(QUrl, domain); QFETCH(QString, TLD); - QCOMPARE(domain.topLevelDomain(QUrl::PrettyDecoded), TLD); - QCOMPARE(domain.topLevelDomain(QUrl::FullyDecoded), TLD); + QCOMPARE(domain.topLevelDomain(), TLD); } void tst_QUrl::lowercasesScheme()