diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-20 16:54:17 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-20 16:54:42 +0100 |
commit | 8a1fadd42dafb8abc54b7e9529f7db1200c643fa (patch) | |
tree | 2975b1546452d2a17fa4a7a4fe4e3ba2e327c591 /src/webengine | |
parent | 1173d48149a8133b607894b67e1ec32de68e21e8 (diff) | |
parent | 5a8bae70bb6caf01c262ed3a607c736ea72561b9 (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I20e36d0e18dd26365557a4093436e9660e30e173
Diffstat (limited to 'src/webengine')
-rw-r--r-- | src/webengine/api/qquickwebenginescript.cpp | 3 |
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; |