summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJocelyn Turcotte <jturcotte@woboq.com>2015-11-17 13:52:39 +0100
committerJocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>2015-11-19 14:17:22 +0000
commitdacb7fa08dd64eaeb8510ca0be24f6da5c2c1b25 (patch)
tree875cc8db04afa60fa0f21d1e6599e21ae3134461 /src
parent9244bc33e32f9df4fcf0eb39b5c5632bf05e3e37 (diff)
Fix loading user scripts from qrc files
QUrl::toLocalFile doesn't handle qrc:// URLs, do like QQuickImageBase instead and use a public utility function to does that conversion. This allows loading qtwebchannel.js and use it in subsequent user scripts. Change-Id: I4791abdc96a7cd1e65ff76b1adeab9f9b250b582 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/webengine/api/qquickwebenginescript.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index affffbf46..71dad701f 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -37,6 +37,7 @@
#include "qquickwebenginescript_p.h"
#include "qquickwebenginescript_p_p.h"
+#include <QQmlFile>
#include <QtCore/QDebug>
#include <QtCore/QFile>
#include <QtCore/QStringBuilder>
@@ -178,7 +179,7 @@ void QQuickWebEngineScript::setSourceUrl(QUrl arg)
d->m_sourceUrl = arg;
Q_EMIT sourceUrlChanged(d->m_sourceUrl);
- QFile f(arg.toLocalFile());
+ QFile f(QQmlFile::urlToLocalFileOrQrc(arg));
if (!f.open(QIODevice::ReadOnly)) {
qWarning() << "Can't open user script " << arg;
return;