From bc7eb95302d9fac44c8e922b173a576aaa9606d5 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Wed, 16 Sep 2009 12:21:38 +0200
Subject: Put back the declarativeData into its union so it doesn't take memory

As it was in commit 025dcc2bb

Reviewed-by: Thiago
---
 src/corelib/kernel/qobject_p.h | 6 ++++--
 1 file 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;
 };
-- 
cgit v0.12