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: (28 commits)
  Add "on" syntax to QmlChanges.txt
  Don't return QDeclarativeDeclarativeData for a deleting object
  Empty URL test
  Fix zooming (broke with transformOrigin default change).
  doc
  Move WebView to an extension plugin.
  follow syntax change
  missed file
  Optimization.
  Add autotests for script block scoping.
  Make test more reliable.
  Add NOTIFY signals to list, grid and path views
  Example of text focus.
  Add docs and tests for WorkerListModel.
  Add NOTIFY signals to list, grid and path views
  Example of text focus.
  Add accessor operations to VisualItemModel::children
  Make "on" syntax mandatory for value sources and interceptors
  Fix warning.
  Minor optimization.
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/tools/qml/qfxtester.h b/tools/qml/qfxtester.h
index 1a9f077..6521409 100644
--- a/tools/qml/qfxtester.h
+++ b/tools/qml/qfxtester.h
@@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeVisualTest : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QList<QObject *>* events READ events CONSTANT)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> events READ events CONSTANT)
     Q_CLASSINFO("DefaultProperty", "events")
 public:
     QDeclarativeVisualTest() {}
 
-    QList<QObject *> *events() { return &m_events; }
+    QDeclarativeListProperty<QObject> events() { return QDeclarativeListProperty<QObject>(this, m_events); }
 
     int count() const { return m_events.count(); }
     QObject *event(int idx) { return m_events.at(idx); }