2 files changed, 7 insertions, 8 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 0801418..7e7dcaf 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -123,10 +123,10 @@ extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *)
 }
 
 QObjectData::~QObjectData() {}
-QObjectDeletionNotification::~QObjectDeletionNotification() {}
+QDeclarativeData::~QDeclarativeData() {}
 
 QObjectPrivate::QObjectPrivate(int version)
-    : threadData(0), connectionLists(0), senders(0), currentSender(0), currentChildBeingDeleted(0), deletionNotification(0), objectGuards(0)
+    : threadData(0), connectionLists(0), senders(0), currentSender(0), currentChildBeingDeleted(0), declarativeData(0), objectGuards(0)
 {
     if (version != QObjectPrivateVersion)
         qFatal("Cannot mix incompatible Qt libraries");
@@ -769,8 +769,8 @@ QObject::~QObject()
     }
 
     emit destroyed(this);
-    if (d->deletionNotification)
-        d->deletionNotification->destroyed(this);
+    if (d->declarativeData)
+        d->declarativeData->destroyed(this);
 
     {
         QMutexLocker locker(signalSlotLock(this));
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index a7f3a5a..e58ee6c 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -84,13 +84,12 @@ extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set;
 
 enum { QObjectPrivateVersion = QT_VERSION };
 
-class Q_CORE_EXPORT QObjectDeletionNotification
+class Q_CORE_EXPORT QDeclarativeData
 {
 public:
-    virtual ~QObjectDeletionNotification();
+    virtual ~QDeclarativeData();
     virtual void destroyed(QObject *) = 0;
 };
-typedef QObjectDeletionNotification QDeclarativeData; // remove me when Declarative UI updates
 
 class Q_CORE_EXPORT QObjectPrivate : public QObjectData
 {
@@ -186,7 +185,7 @@ public:
 
     // these objects are all used to indicate that a QObject was deleted
     // plus QPointer, which keeps a separate list
-    QObjectDeletionNotification *deletionNotification;
+    QDeclarativeData *declarativeData;
     QGuard<QObject> *objectGuards;
     int *deleteWatch;
 };