Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I85be5e6ef173fa733d7febd3209164bb31762e0d

1 files changed, 15 insertions, 0 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 3b4574c18b..2377b7dc38 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -849,6 +849,11 @@ Heap::Object *ExecutionEngine::newErrorObject(const Value &value)
     return ErrorObject::create<ErrorObject>(this, value, errorCtor());
 }
 
+Heap::Object *ExecutionEngine::newErrorObject(const QString &message)
+{
+    return ErrorObject::create<ErrorObject>(this, message);
+}
+
 Heap::Object *ExecutionEngine::newSyntaxErrorObject(const QString &message)
 {
     return ErrorObject::create<SyntaxErrorObject>(this, message);
@@ -918,6 +923,16 @@ Promise::ReactionHandler *ExecutionEngine::getPromiseReactionHandler()
     return m_reactionHandler.data();
 }
 
+Heap::Object *ExecutionEngine::newURIErrorObject(const QString &message)
+{
+    return ErrorObject::create<URIErrorObject>(this, message);
+}
+
+Heap::Object *ExecutionEngine::newEvalErrorObject(const QString &message)
+{
+    return ErrorObject::create<EvalErrorObject>(this, message);
+}
+
 Heap::Object *ExecutionEngine::newVariantObject(const QVariant &v)
 {
     return memoryManager->allocate<VariantObject>(v);