diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-04-04 12:22:00 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:48:54 +0200 |
| commit | 05f17e841f971d3c8f635cc044c60c970c2055c9 (patch) | |
| tree | 0eaf8348ef9d9b25c050527ec6c7de8aac9a56ea /src/qml/qml | |
| parent | c2ef5bff232f758716f1665e5d9d9b9b2f20385d (diff) | |
Get rid of different macros for vtable specializations
Detect existence of a a vtable entry at compile time.
Change-Id: Ieed5d34b063184bc4435b22c6685ac0e3fabf493
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlcontextwrapper.cpp | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 4 | ||||
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmlcontextwrapper.cpp b/src/qml/qml/qqmlcontextwrapper.cpp index 1480625974..a5574b706a 100644 --- a/src/qml/qml/qqmlcontextwrapper.cpp +++ b/src/qml/qml/qqmlcontextwrapper.cpp @@ -437,7 +437,7 @@ ReturnedValue QmlContextWrapper::qmlSingletonWrapper(QV8Engine *v8, const String return QJSValuePrivate::get(siinfo->scriptApi(e))->getValue(engine()); } -DEFINE_OBJECT_VTABLE_NO_DESTROY(QQmlIdObjectsArray); +DEFINE_OBJECT_VTABLE(QQmlIdObjectsArray); QQmlIdObjectsArray::QQmlIdObjectsArray(ExecutionEngine *engine, QmlContextWrapper *contextWrapper) : Object(engine) diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index 1a8564d111..d89dc92b68 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -302,7 +302,7 @@ public: }; -DEFINE_OBJECT_VTABLE_NO_DESTROY(NodePrototype); +DEFINE_OBJECT_VTABLE(NodePrototype); class Node : public Object { @@ -1696,7 +1696,7 @@ struct QQmlXMLHttpRequestCtor : public FunctionObject Object *proto; }; -DEFINE_OBJECT_VTABLE_NO_DESTROY(QQmlXMLHttpRequestCtor); +DEFINE_OBJECT_VTABLE(QQmlXMLHttpRequestCtor); void QQmlXMLHttpRequestCtor::setupProto() { diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 03e2830fee..67e9e80efb 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -78,7 +78,7 @@ QT_BEGIN_NAMESPACE using namespace QV4; -DEFINE_OBJECT_VTABLE_NO_DESTROY(QtObject); +DEFINE_OBJECT_VTABLE(QtObject); struct StaticQtMetaObject : public QObject { |