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

3 files changed, 12 insertions, 2 deletions

diff --git a/src/declarative/qml/qdeclarativecompiledbindings_p.h b/src/declarative/qml/qdeclarativecompiledbindings_p.h
index 84a5df9..8776c08 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings_p.h
+++ b/src/declarative/qml/qdeclarativecompiledbindings_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeBindingCompilerPrivate;
+struct QDeclarativeBindingCompilerPrivate;
 class QDeclarativeBindingCompiler
 {
 public:
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index e5f18b3..397f37a 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -213,8 +213,11 @@ public:
 
     inline operator QDeclarativeContextData*() const { return m_contextData; }
     inline QDeclarativeContextData* operator->() const { return m_contextData; }
+    inline QDeclarativeGuardedContextData &operator=(QDeclarativeContextData *d);
 
 private:
+    QDeclarativeGuardedContextData &operator=(const QDeclarativeGuardedContextData &);
+    QDeclarativeGuardedContextData(const QDeclarativeGuardedContextData &);
     friend class QDeclarativeContextData;
 
     inline void clear();
@@ -269,6 +272,13 @@ void QDeclarativeGuardedContextData::clear()
     }
 }
 
+QDeclarativeGuardedContextData &
+QDeclarativeGuardedContextData::operator=(QDeclarativeContextData *d)
+{
+    setContextData(d);
+    return *this;
+}
+
 QT_END_NAMESPACE
 
 #endif // QDECLARATIVECONTEXT_P_H
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
index e70b4bf..b3ec5e3 100644
--- a/src/declarative/qml/qdeclarativemetatype_p.h
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -138,7 +138,7 @@ public:
     int index() const;
 private:
     friend class QDeclarativeTypePrivate;
-    friend class QDeclarativeMetaTypeData;
+    friend struct QDeclarativeMetaTypeData;
     friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterInterface &);
     friend int QDeclarativePrivate::registerType(const QDeclarativePrivate::RegisterType &);
     QDeclarativeType(int, const QDeclarativePrivate::RegisterInterface &);