From dacb7fa08dd64eaeb8510ca0be24f6da5c2c1b25 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Tue, 17 Nov 2015 13:52:39 +0100
Subject: Fix loading user scripts from qrc files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/webengine/api/qquickwebenginescript.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/webengine/api/qquickwebenginescript.cpp')

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;
-- 
cgit v1.2.3