diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-10-06 11:15:35 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-10-06 11:15:35 (GMT) |
| commit | 0d6c7a6b0dafec4e579916e99725d3f8b49d0910 (patch) | |
| tree | 810f9c50e882ec67fff351bd112b0d5d48bf7495 /src/corelib/io/qurl.cpp | |
| parent | 9c73671c3b917a2a6a22411fb17c46dfa5e21049 (diff) | |
| parent | 1f5afc4300d3d7e3063f4e2c80a280a5098717d1 (diff) | |
| download | Qt-0d6c7a6b0dafec4e579916e99725d3f8b49d0910.zip Qt-0d6c7a6b0dafec4e579916e99725d3f8b49d0910.tar.gz Qt-0d6c7a6b0dafec4e579916e99725d3f8b49d0910.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/io/qurl.cpp')
| -rw-r--r-- | src/corelib/io/qurl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index c9a4cf1..22d0019 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -3384,6 +3384,8 @@ QString QUrlPrivate::canonicalHost() const const char *ptr = ba.constData(); if (!_IPLiteral(&ptr)) that->host.clear(); + else + that->host = host.toLower(); } else { that->host = qt_ACE_do(host, NormalizeAce); } @@ -5941,7 +5943,7 @@ QString QUrl::toLocalFile() const QString tmp; QString ourPath = path(); - if (d->scheme.isEmpty() || d->scheme.toLower() == QLatin1String("file")) { + if (d->scheme.isEmpty() || QString::compare(d->scheme, QLatin1String("file"), Qt::CaseInsensitive) == 0) { // magic for shared drive on windows if (!d->host.isEmpty()) { |