diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-20 13:51:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-21 20:46:50 +0100 |
| commit | 7d4fc70e70ca566900c01aa7c5e3ec4770d15933 (patch) | |
| tree | 8b223bae1ab0604788abae489e87ec2fbd5298e8 /src/qml/qml/qqmlcontextwrapper_p.h | |
| parent | 3efae4fc7fff96f147f79013ef9fff9c31557229 (diff) | |
Split ManagedVTable into two classes
Keep the basic methods in ManagedVTable, but have
the Object related stuff in an ObjectVTable class.
Change-Id: I9b068acf3caef813686227b8d935e7df1a7d1a6e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlcontextwrapper_p.h')
| -rw-r--r-- | src/qml/qml/qqmlcontextwrapper_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h index 89ace7090c..bd56d4bcec 100644 --- a/src/qml/qml/qqmlcontextwrapper_p.h +++ b/src/qml/qml/qqmlcontextwrapper_p.h @@ -73,7 +73,7 @@ struct QQmlIdObjectsArray; struct Q_QML_EXPORT QmlContextWrapper : Object { - Q_MANAGED + V4_OBJECT QmlContextWrapper(QV8Engine *engine, QQmlContextData *context, QObject *scopeObject, bool ownsContext = false); ~QmlContextWrapper(); @@ -112,7 +112,7 @@ private: struct QQmlIdObjectsArray : public Object { - Q_MANAGED + V4_OBJECT QQmlIdObjectsArray(ExecutionEngine *engine, QmlContextWrapper *contextWrapper); static ReturnedValue getIndexed(Managed *m, uint index, bool *hasProperty); |