Merge remote-tracking branch 'origin/5.11.0' into wip/webassembly

Change-Id: Ice58db1687c0cfbd5a19e84ca9fa81b8d3fa7959

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index 24291b9aa6..b4ac150044 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -93,7 +93,7 @@ struct Q_QML_EXPORT Script {
     bool parseAsBinding;
 
     void parse();
-    ReturnedValue run();
+    ReturnedValue run(const QV4::Value *thisObject = nullptr);
 
     Function *function();
 
@@ -101,7 +101,7 @@ struct Q_QML_EXPORT Script {
             QV4::Compiler::Module *module, Compiler::JSUnitGenerator *unitGenerator,
             const QString &fileName, const QString &finalUrl, const QString &source,
             QList<QQmlError> *reportedErrors = nullptr, QQmlJS::Directives *directivesCollector = nullptr);
-    static Script *createFromFileOrCache(ExecutionEngine *engine, QmlContext *qmlContext, const QString &fileName, const QUrl &originalUrl);
+    static Script *createFromFileOrCache(ExecutionEngine *engine, QmlContext *qmlContext, const QString &fileName, const QUrl &originalUrl, QString *error);
 
     static ReturnedValue evaluate(ExecutionEngine *engine, const QString &script, QmlContext *qmlContext);
 };