aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/types
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-04-03 13:00:49 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2014-07-22 13:48:53 +0200
commit4427576fe548b6f9f8acba6a5ac3082fbbb99724 (patch)
tree309f80779da95f337dd869e1990ffd4f0bb9b724 /src/qml/types
parent08a3c0edeb3cdfa15a9fecdfb4c7c1ab82227437 (diff)
Avoid calling destroy() on most objects
The method is now optional, and we can simply avoid calling it if all members an object has are themselves garbage collected. Change-Id: If560fce051908bcc10409ead1a7d8a5bd5fa71d2 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/types')
-rw-r--r--src/qml/types/qqmldelegatemodel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
index f7ce1c8fad..c86f1c989f 100644
--- a/src/qml/types/qqmldelegatemodel.cpp
+++ b/src/qml/types/qqmldelegatemodel.cpp
@@ -93,7 +93,7 @@ struct DelegateModelGroupFunction: QV4::FunctionObject
}
};
-DEFINE_OBJECT_VTABLE(DelegateModelGroupFunction);
+DEFINE_OBJECT_VTABLE_NO_DESTROY(DelegateModelGroupFunction);
@@ -3237,7 +3237,7 @@ struct QQmlDelegateModelGroupChange : QV4::Object
QQmlChangeSet::Change change;
};
-DEFINE_OBJECT_VTABLE(QQmlDelegateModelGroupChange);
+DEFINE_OBJECT_VTABLE_NO_DESTROY(QQmlDelegateModelGroupChange);
class QQmlDelegateModelGroupChangeArray : public QV4::Object
{