Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

1 files changed, 5 insertions, 8 deletions

diff --git a/src/declarative/qml/qdeclarativedata_p.h b/src/declarative/qml/qdeclarativedata_p.h
index def4188..4767169 100644
--- a/src/declarative/qml/qdeclarativedata_p.h
+++ b/src/declarative/qml/qdeclarativedata_p.h
@@ -65,6 +65,7 @@ class QDeclarativeContext;
 class QDeclarativePropertyCache;
 class QDeclarativeContextData;
 class QDeclarativeNotifier;
+class QDeclarativeDataExtended;
 // This class is structured in such a way, that simply zero'ing it is the
 // default state for elemental object allocations.  This is crucial in the
 // workings of the QDeclarativeInstruction::CreateSimpleObject instruction.
@@ -150,17 +151,13 @@ public:
         }
     }
 
+    bool hasExtendedData() const { return extendedData != 0; }
     QDeclarativeNotifier *objectNameNotifier() const;
     QHash<int, QObject *> *attachedProperties() const;
 
-    struct ExtendedData {
-        ExtendedData();
-        ~ExtendedData();
-
-        QHash<int, QObject *> attachedProperties;
-        void *objectNameNotifier;
-    };
-    mutable ExtendedData *extendedData;
+private:
+    // For objectNameNotifier and attachedProperties
+    mutable QDeclarativeDataExtended *extendedData;
 };
 
 template<class T>