Skip to content

Commit dacb7fa

Browse files
committed
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 <[email protected]>
1 parent 9244bc3 commit dacb7fa

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/webengine/api/qquickwebenginescript.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "qquickwebenginescript_p.h"
3838
#include "qquickwebenginescript_p_p.h"
3939

40+
#include <QQmlFile>
4041
#include <QtCore/QDebug>
4142
#include <QtCore/QFile>
4243
#include <QtCore/QStringBuilder>
@@ -178,7 +179,7 @@ void QQuickWebEngineScript::setSourceUrl(QUrl arg)
178179
d->m_sourceUrl = arg;
179180
Q_EMIT sourceUrlChanged(d->m_sourceUrl);
180181

181-
QFile f(arg.toLocalFile());
182+
QFile f(QQmlFile::urlToLocalFileOrQrc(arg));
182183
if (!f.open(QIODevice::ReadOnly)) {
183184
qWarning() << "Can't open user script " << arg;
184185
return;

0 commit comments

Comments
 (0)