diff options
Diffstat (limited to 'src/qml/jsapi')
-rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 7 | ||||
-rw-r--r-- | src/qml/jsapi/qjsengine_p.h | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 09891019c5..8525aedb6c 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -530,7 +530,7 @@ bool QJSEngine::convertV2(const QJSValue &value, int type, void *ptr) Creates a QJSValue with the given \a value. - \sa fromScriptValue() + \sa fromScriptValue(), newVariant() */ /*! \fn T QJSEngine::fromScriptValue(const QJSValue &value) @@ -541,6 +541,11 @@ bool QJSEngine::convertV2(const QJSValue &value, int type, void *ptr) */ +QJSEnginePrivate *QJSEnginePrivate::get(QV4::ExecutionEngine *e) +{ + return e->v8Engine->publicEngine()->d_func(); +} + QJSEnginePrivate::~QJSEnginePrivate() { for (QHash<const QMetaObject *, QQmlPropertyCache *>::Iterator iter = propertyCache.begin(); iter != propertyCache.end(); ++iter) diff --git a/src/qml/jsapi/qjsengine_p.h b/src/qml/jsapi/qjsengine_p.h index eba8ffb4be..3f7e91bffe 100644 --- a/src/qml/jsapi/qjsengine_p.h +++ b/src/qml/jsapi/qjsengine_p.h @@ -54,6 +54,10 @@ QT_BEGIN_NAMESPACE class QQmlPropertyCache; +namespace QV4 { +struct ExecutionEngine; +} + class QJSEnginePrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QJSEngine) @@ -61,6 +65,7 @@ class QJSEnginePrivate : public QObjectPrivate public: static QJSEnginePrivate* get(QJSEngine*e) { return e->d_func(); } static const QJSEnginePrivate* get(const QJSEngine*e) { return e->d_func(); } + static QJSEnginePrivate* get(QV4::ExecutionEngine *e); QJSEnginePrivate() : mutex(QMutex::Recursive) {} ~QJSEnginePrivate(); |