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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (119 commits)
  Add Mac OS X bundle description for qml runtime
  Cleanup
  Disallow writes to read-only value type properties
  Allow undefined to be assigned to QVariant properties
  Add a Qt.isQtObject() method
  Fix crash in QML library imports
  Remove QT_VERSION checks in QML
  List properties aren't read-only
  Small doc fix.
  Make sure WorkerScript thread is stopped on deletion. This also fixes
  Release ListModel's worker agent on deletion.
  Doc fixes
  Fix example
  Example code style improvements
  Enable other wrapping modes.
  TextEdit::wrap changed to TextEdit::wrapMode enumeration
  Remove use of obsolete "Script" element.
  unwarn
  Replace "var" with "variant" in tests
  Fix test after deletion of GraphicsObjectContainer.
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/qml/qdeclarativecontextscriptclass_p.h b/src/declarative/qml/qdeclarativecontextscriptclass_p.h
index b89f0cd..1936d38 100644
--- a/src/declarative/qml/qdeclarativecontextscriptclass_p.h
+++ b/src/declarative/qml/qdeclarativecontextscriptclass_p.h
@@ -54,14 +54,14 @@
 //
 
 #include "private/qdeclarativetypenamecache_p.h"
-#include "private/qdeclarativescriptclass_p.h"
+#include <private/qscriptdeclarativeclass_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeEngine;
 class QDeclarativeContext;
 class QDeclarativeContextData;
-class QDeclarativeContextScriptClass : public QDeclarativeScriptClass
+class QDeclarativeContextScriptClass : public QScriptDeclarativeClass
 {
 public:
     QDeclarativeContextScriptClass(QDeclarativeEngine *);
@@ -76,7 +76,7 @@ public:
 protected:
     virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
                                                    QScriptClass::QueryFlags flags);
-    virtual ScriptValue property(Object *, const Identifier &);
+    virtual Value property(Object *, const Identifier &);
     virtual void setProperty(Object *, const Identifier &name, const QScriptValue &);
 
 private: