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

Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
	src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
	src/plugins/qmltooling/qmldbg_nativedebugger/qqmlnativedebugservice.cpp
	src/qml/qml/qqmlimport.cpp
	src/quick/items/context2d/qquickcontext2dtexture_p.h
	tools/qmleasing/splineeditor.h

Change-Id: I8f6630fcac243824350986c8e9f4bd6483bf20b5

3 files changed, 13 insertions, 47 deletions

diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index cf0fd57773..19dc100f40 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -148,9 +148,7 @@ void Heap::QtObject::init(QQmlEngine *qmlEngine)
 
     o->defineAccessorProperty(QStringLiteral("platform"), QV4::QtObject::method_get_platform, 0);
     o->defineAccessorProperty(QStringLiteral("application"), QV4::QtObject::method_get_application, 0);
-#ifndef QT_NO_IM
     o->defineAccessorProperty(QStringLiteral("inputMethod"), QV4::QtObject::method_get_inputMethod, 0);
-#endif
     o->defineAccessorProperty(QStringLiteral("styleHints"), QV4::QtObject::method_get_styleHints, 0);
 
     o->defineDefaultProperty(QStringLiteral("callLater"), QV4::QtObject::method_callLater);
@@ -1031,7 +1029,7 @@ ReturnedValue QtObject::method_exit(CallContext *ctx)
 /*!
 \qmlmethod object Qt::createQmlObject(string qml, object parent, string filepath)
 
-Returns a new object created from the given \a string of QML which will have the specified \a parent,
+Returns a new object created from the given \a qml string which will have the specified \a parent,
 or \c null if there was an error in creating the object.
 
 If \a filepath is specified, it will be used for error reporting for the created object.
@@ -1305,30 +1303,15 @@ ReturnedValue QtObject::method_locale(CallContext *ctx)
 
 void Heap::QQmlBindingFunction::init(const QV4::FunctionObject *originalFunction)
 {
-    QV4::Heap::FunctionObject::init(originalFunction->scope(), originalFunction->name());
-    bindingLocation = new QQmlSourceLocation;
-    this->originalFunction = originalFunction->d();
+    Scope scope(originalFunction->engine());
+    ScopedContext context(scope, originalFunction->scope());
+    FunctionObject::init(context, originalFunction->function());
 }
 
-void QQmlBindingFunction::initBindingLocation()
+QQmlSourceLocation QQmlBindingFunction::currentLocation() const
 {
     QV4::StackFrame frame = engine()->currentStackFrame();
-    d()->bindingLocation->sourceFile = frame.source;
-    d()->bindingLocation->line = frame.line;
-}
-
-void QQmlBindingFunction::call(const Managed *that, Scope &scope, CallData *callData)
-{
-    ScopedFunctionObject function(scope, static_cast<const QQmlBindingFunction*>(that)->d()->originalFunction);
-    function->call(scope, callData);
-}
-
-void QQmlBindingFunction::markObjects(Heap::Base *that, ExecutionEngine *e)
-{
-    QQmlBindingFunction::Data *This = static_cast<QQmlBindingFunction::Data *>(that);
-    if (This->originalFunction)
-        This->originalFunction->mark(e);
-    QV4::FunctionObject::markObjects(that, e);
+    return QQmlSourceLocation(frame.source, frame.line, 0);
 }
 
 DEFINE_OBJECT_VTABLE(QQmlBindingFunction);
@@ -1423,13 +1406,11 @@ ReturnedValue QtObject::method_get_application(CallContext *ctx)
     return QV4::QObjectWrapper::wrap(ctx->d()->engine, qt->d()->application);
 }
 
-#ifndef QT_NO_IM
 ReturnedValue QtObject::method_get_inputMethod(CallContext *ctx)
 {
     QObject *o = QQml_guiProvider()->inputMethod();
     return QV4::QObjectWrapper::wrap(ctx->d()->engine, o);
 }
-#endif
 
 ReturnedValue QtObject::method_get_styleHints(CallContext *ctx)
 {
@@ -1740,7 +1721,7 @@ void QV4::GlobalExtensions::init(Object *globalObject, QJSEngine::Extensions ext
     Scope scope(v4);
 
     if (extensions.testFlag(QJSEngine::TranslationExtension)) {
-    #ifndef QT_NO_TRANSLATION
+    #if QT_CONFIG(translation)
         globalObject->defineDefaultProperty(QStringLiteral("qsTranslate"), QV4::GlobalExtensions::method_qsTranslate);
         globalObject->defineDefaultProperty(QStringLiteral("QT_TRANSLATE_NOOP"), QV4::GlobalExtensions::method_qsTranslateNoOp);
         globalObject->defineDefaultProperty(QStringLiteral("qsTr"), QV4::GlobalExtensions::method_qsTr);
@@ -1767,7 +1748,7 @@ void QV4::GlobalExtensions::init(Object *globalObject, QJSEngine::Extensions ext
 }
 
 
-#ifndef QT_NO_TRANSLATION
+#if QT_CONFIG(translation)
 /*!
     \qmlmethod string Qt::qsTranslate(string context, string sourceText, string disambiguation, int n)
 
@@ -2015,7 +1996,7 @@ ReturnedValue GlobalExtensions::method_qsTrIdNoOp(CallContext *ctx)
         return QV4::Encode::undefined();
     return ctx->args()[0].asReturnedValue();
 }
-#endif // QT_NO_TRANSLATION
+#endif // translation
 
 
 QV4::ReturnedValue GlobalExtensions::method_gc(CallContext *ctx)
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
index f428e377d7..fe43532647 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
@@ -82,13 +82,6 @@ struct ConsoleObject : Object {
 
 struct QQmlBindingFunction : FunctionObject {
     void init(const QV4::FunctionObject *originalFunction);
-    void destroy() {
-        delete bindingLocation;
-        Object::destroy();
-    }
-    Pointer<FunctionObject> originalFunction;
-    // Set when the binding is created later
-    QQmlSourceLocation *bindingLocation;
 };
 
 }
@@ -135,9 +128,7 @@ struct QtObject : Object
 
     static ReturnedValue method_get_platform(CallContext *ctx);
     static ReturnedValue method_get_application(CallContext *ctx);
-#ifndef QT_NO_IM
     static ReturnedValue method_get_inputMethod(CallContext *ctx);
-#endif
     static ReturnedValue method_get_styleHints(CallContext *ctx);
 
     static ReturnedValue method_callLater(CallContext *ctx);
@@ -169,7 +160,7 @@ struct ConsoleObject : Object
 struct Q_QML_PRIVATE_EXPORT GlobalExtensions {
     static void init(Object *globalObject, QJSEngine::Extensions extensions);
 
-#ifndef QT_NO_TRANSLATION
+#if QT_CONFIG(translation)
     static ReturnedValue method_qsTranslate(CallContext *ctx);
     static ReturnedValue method_qsTranslateNoOp(CallContext *ctx);
     static ReturnedValue method_qsTr(CallContext *ctx);
@@ -187,13 +178,8 @@ struct Q_QML_PRIVATE_EXPORT GlobalExtensions {
 struct QQmlBindingFunction : public QV4::FunctionObject
 {
     V4_OBJECT2(QQmlBindingFunction, FunctionObject)
-    V4_NEEDS_DESTROY
-
-    void initBindingLocation(); // from caller stack trace
-
-    static void call(const Managed *that, Scope &scope, CallData *callData);
 
-    static void markObjects(Heap::Base *that, ExecutionEngine *e);
+    QQmlSourceLocation currentLocation() const; // from caller stack trace
 };
 
 }
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp
index b0599dd0a2..dadff819cf 100644
--- a/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp
@@ -52,7 +52,6 @@
 #include <private/qqmlplatform_p.h>
 #include <private/qjsvalue_p.h>
 #include <private/qqmltypewrapper_p.h>
-#include <private/qqmlcontextwrapper_p.h>
 #include <private/qqmlvaluetypewrapper_p.h>
 #include <private/qqmllistwrapper_p.h>
 #include <private/qv4scopedvalue_p.h>
@@ -160,7 +159,7 @@ QV8Engine::~QV8Engine()
     qDeleteAll(m_extensionData);
     m_extensionData.clear();
 
-#if !defined(QT_NO_XMLSTREAMREADER) && QT_CONFIG(qml_network)
+#if QT_CONFIG(xmlstreamreader) && QT_CONFIG(qml_network)
     qt_rem_qmlxmlhttprequest(m_v4Engine, m_xmlHttpRequestData);
     m_xmlHttpRequestData = 0;
 #endif
@@ -195,7 +194,7 @@ void QV8Engine::initializeGlobal()
     QQmlDateExtension::registerExtension(m_v4Engine);
     QQmlNumberExtension::registerExtension(m_v4Engine);
 
-#if !defined(QT_NO_XMLSTREAMREADER) && QT_CONFIG(qml_network)
+#if QT_CONFIG(xmlstreamreader) && QT_CONFIG(qml_network)
     qt_add_domexceptions(m_v4Engine);
     m_xmlHttpRequestData = qt_add_qmlxmlhttprequest(m_v4Engine);
 #endif