AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix QUrl::topLevelDomain(QUrl::FullyDecoded)"

Browse Source 
This reverts commit e3fa266623b08e837cb4ccc7fe59da243d03dd27

That commit applied a change at the wrong place in the code.

Change-Id: I21e3045a3af14ad2f90c5fe338815c35a2d27ae6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
This commit is contained in:
Thiago Macieira 2013-07-01 19:51:14 +02:00 committed by The Qt Project
parent 0730e7b023
commit c1d65d996b
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/io/qurlidna.cpp
View File

@ -2479,8 +2479,7 @@ QString qt_ACE_do(const QString &domain, AceOperation op)
if (labelLength == 0) { if (labelLength == 0) {
if (idx == domain.length()) if (idx == domain.length())
break; 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: // RFC 3490 says, about the ToASCII operation:

3
tests/auto/corelib/io/qurl/tst_qurl.cpp
View File

@ -2863,8 +2863,7 @@ void tst_QUrl::effectiveTLDs()
{ {
QFETCH(QUrl, domain); QFETCH(QUrl, domain);
QFETCH(QString, TLD); QFETCH(QString, TLD);
QCOMPARE(domain.topLevelDomain(QUrl::PrettyDecoded), TLD); QCOMPARE(domain.topLevelDomain(), TLD);
QCOMPARE(domain.topLevelDomain(QUrl::FullyDecoded), TLD);
} }
void tst_QUrl::lowercasesScheme() void tst_QUrl::lowercasesScheme()