diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-07 13:17:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-07 13:31:11 +0200 |
| commit | 3fe97384fef6fd7d167017cd950313b34a64c9c1 (patch) | |
| tree | 6213d12c923924e6f3442c9deee1850f25146d36 /src/qml/qml/qqmlpropertycache.cpp | |
| parent | 78fc64d11c187a796e6b80bd1f35792e202fa9f9 (diff) | |
Make the default constructor of PersistentValue not allocate a d pointer
This is also required to change the v8::Persistent in QQmlData over
to v4.
Change-Id: Ib3164ded9c772e977f6b43ef6163a3aa74da3800
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index df3d558cb4..bcfc901c53 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -290,8 +290,8 @@ QQmlPropertyCache::~QQmlPropertyCache() void QQmlPropertyCache::destroy() { - Q_ASSERT(engine || constructor->isEmpty()); - if (constructor->isEmpty()) + Q_ASSERT(engine || constructor.isEmpty()); + if (constructor.isEmpty()) delete this; else QQmlEnginePrivate::deleteInEngineThread(engine, this); @@ -598,7 +598,7 @@ void QQmlPropertyCache::append(QQmlEngine *engine, const QMetaObject *metaObject QQmlPropertyData::Flag signalFlags) { Q_UNUSED(revision); - Q_ASSERT(constructor->isEmpty()); // We should not be appending to an in-use property cache + Q_ASSERT(constructor.isEmpty()); // We should not be appending to an in-use property cache _metaObject = metaObject; |