diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-07-20 11:00:50 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-07-20 11:00:50 (GMT) |
commit | 433872d7e26a6a99297e231ac3bc0f603c9cefe8 (patch) | |
tree | 06ddc09478d5b0716121043ccde471136ff0eb60 /src/network | |
parent | b66db48934bc13cc7439e0fc9c8ec54122678a02 (diff) | |
parent | 4082ed92ed80c57cb499de569631a664107ef05b (diff) | |
download | Qt-433872d7e26a6a99297e231ac3bc0f603c9cefe8.zip Qt-433872d7e26a6a99297e231ac3bc0f603c9cefe8.tar.gz Qt-433872d7e26a6a99297e231ac3bc0f603c9cefe8.tar.bz2 |
Merge remote-tracking branch 'earth-team/master'
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/access/qnetworkaccessfilebackend.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp index 42cc2c2..7c4adca 100644 --- a/src/network/access/qnetworkaccessfilebackend.cpp +++ b/src/network/access/qnetworkaccessfilebackend.cpp @@ -67,7 +67,7 @@ QNetworkAccessFileBackendFactory::create(QNetworkAccessManager::Operation op, QUrl url = request.url(); if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0 || url.isLocalFile()) { return new QNetworkAccessFileBackend; - } else if (!url.scheme().isEmpty() && url.authority().isEmpty()) { + } else if (!url.isEmpty() && url.authority().isEmpty()) { // check if QFile could, in theory, open this URL via the file engines // it has to be in the format: // prefix:path/to/file @@ -75,7 +75,8 @@ QNetworkAccessFileBackendFactory::create(QNetworkAccessManager::Operation op, // // this construct here must match the one below in open() QFileInfo fi(url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery)); - if ((url.scheme().length()==1) && fi.exists()) + // On Windows and Symbian the drive letter is detected as the scheme. + if (fi.exists() && (url.scheme().isEmpty() || (url.scheme().length() == 1))) qWarning("QNetworkAccessFileBackendFactory: URL has no schema set, use file:// for files"); if (fi.exists() || (op == QNetworkAccessManager::PutOperation && fi.dir().exists())) return new QNetworkAccessFileBackend; |