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

Fix QUrl::StripTrailingSlash for the case of no path at all.

Browse Source 
Change-Id: I1fd0fe4b9b67996732c85c1792415e371e865595
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
David Faure 2012-05-08 13:17:26 +02:00 committed by Qt by Nokia
parent 33edd606ae
commit 677858ad9e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qurl.cpp
View File

@ -2159,7 +2159,7 @@ QString QUrl::toString(FormattingOptions options) const
d->appendPath(url, options, QUrlPrivate::FullUrl);
// check if we need to remove trailing slashes
if ((options & StripTrailingSlash) && d->path != QLatin1String("/") && url.endsWith(QLatin1Char('/')))
if ((options & StripTrailingSlash) && !d->path.isEmpty() && d->path != QLatin1String("/") && url.endsWith(QLatin1Char('/')))
url.chop(1);
}

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

@ -2257,6 +2257,7 @@ void tst_QUrl::stripTrailingSlash_data()
QTest::newRow("file slash") << "file:///dir/" << "file:///dir";
QTest::newRow("file no slash") << "file:///dir/" << "file:///dir";
QTest::newRow("file root") << "file:///" << "file:///";
QTest::newRow("no path") << "remote://" << "remote://";
}
void tst_QUrl::stripTrailingSlash()