summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-09-15 10:06:39 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-17 05:20:52 +0000
commit5838af270052c8befe31f9ddcf29d02bb0a5084a (patch)
tree0ef04d021747d6e83df5bca96476596b54aff4db /src
parent310db2b8164fd2a8d9bed4bbf46faa674ff553cc (diff)
Fix qrc sources for QWebEngineScript
Fixes: QTBUG-96525 Change-Id: I39d6247c0dd0e55e4fb91b176f34e676eeabbcdd Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit ce2d6a94ce99f8d6f82fbcbf45603f8eb7a92957) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/core/api/qwebenginescript.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/api/qwebenginescript.cpp b/src/core/api/qwebenginescript.cpp
index f23e91ea5..e414a8a6f 100644
--- a/src/core/api/qwebenginescript.cpp
+++ b/src/core/api/qwebenginescript.cpp
@@ -181,12 +181,11 @@ void QWebEngineScript::setSourceUrl(const QUrl &url)
d->setSourceUrl(url);
QFile file;
- if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0) {
+ if (url.isLocalFile()) {
+ file.setFileName(url.toLocalFile());
+ } else if (url.scheme().compare(QLatin1String("qrc"), Qt::CaseInsensitive) == 0) {
if (url.authority().isEmpty())
file.setFileName(QLatin1Char(':') + url.path());
- return;
- } else {
- file.setFileName(url.toLocalFile());
}
if (!file.open(QIODevice::ReadOnly)) {