diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/kernel/qobject_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index eb8035c..f087407 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -194,11 +194,13 @@ public: #endif QList<QPointer<QObject> > eventFilters; - QObject *currentChildBeingDeleted; + union { + QObject *currentChildBeingDeleted; + QDeclarativeData *declarativeData; //extra data used by the DeclarativeUI project. + }; // these objects are all used to indicate that a QObject was deleted // plus QPointer, which keeps a separate list - QDeclarativeData *declarativeData; QAtomicPointer<QtSharedPointer::ExternalRefCountData> sharedRefcount; int *deleteWatch; }; |