mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 23:36:44 +02:00
Merge pull request #5760 from ZappoMan/fixLocalFileIncludes
fix degenerative url scheme case
This commit is contained in:
commit
e8fca7f6ae
1 changed files with 7 additions and 0 deletions
|
@ -25,6 +25,13 @@ ResourceRequest* ResourceManager::createResourceRequest(QObject* parent, const Q
|
||||||
return new HTTPResourceRequest(parent, url);
|
return new HTTPResourceRequest(parent, url);
|
||||||
} else if (scheme == URL_SCHEME_ATP) {
|
} else if (scheme == URL_SCHEME_ATP) {
|
||||||
return new AssetResourceRequest(parent, url);
|
return new AssetResourceRequest(parent, url);
|
||||||
|
} else {
|
||||||
|
// check the degenerative file case: on windows we can often have urls of the form c:/filename
|
||||||
|
// this checks for and works around that case.
|
||||||
|
QUrl urlWithFileScheme { URL_SCHEME_FILE + ":///" + url.toString() };
|
||||||
|
if (!urlWithFileScheme.toLocalFile().isEmpty()) {
|
||||||
|
return new FileResourceRequest(parent, urlWithFileScheme);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << "Unknown scheme (" << scheme << ") for URL: " << url.url();
|
qDebug() << "Unknown scheme (" << scheme << ") for URL: " << url.url();
|
||||||
|
|
Loading…
Reference in a new issue