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: (132 commits)
  Fix auto test
  Fix type lookup with url
  Fix default values on Textinput
  Add an implicit import "." to types loaded from a local url
  Fix crash
  Don't use Qt3 support methods.
  Crash
  Add/delete albums in photoviewer.
  Emits itemsRemoved() in QDeclarativeListModel::remove.
  Readd the itemtree benchmarks for comparison purposes.
  Allow enum constants as list element properties.
  Compile
  Cleanup benchmark a little
  Really fix warning.
  Fix warnings.
  MouseArea works now with any QGraphicsObject
  Make states test work with smaller font size.
  Register QGraphicsWidget type.
  Add ListView and GridView.indexAt() methods to get the index at a point.
  Tests for default count(), get() values should be run on the worker
  ...

1 files changed, 4 insertions, 1 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index cca42e2..a81259b 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -72,6 +72,7 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeEngine;
 class QDeclarativeComponent;
 class QDeclarativeContext;
+class QDeclarativeContextData;
 
 class QScriptProgram;
 class Q_AUTOTEST_EXPORT QDeclarativeCompiledData : public QDeclarativeRefCount, public QDeclarativeCleanup
@@ -95,7 +96,7 @@ public:
         QDeclarativeComponent *component;
 
         QDeclarativeRefCount *ref;
-        QObject *createInstance(QDeclarativeContext *, const QBitField &) const;
+        QObject *createInstance(QDeclarativeContextData *, const QBitField &) const;
         const QMetaObject *metaObject() const;
     };
     QList<TypeReference> types;
@@ -160,6 +161,8 @@ public:
 
     static QMetaMethod findSignalByName(const QMetaObject *, const QByteArray &name);
 
+    int evaluateEnum(const QByteArray& script) const; // for QDeclarativeCustomParser::evaluateEnum
+
 private:
     static void reset(QDeclarativeCompiledData *);