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: (104 commits)
  Include QML doc snippets in examples autotest
  Update QML documentation snippets to latest syntax.
  MouseRegion is dead.  Long live MouseArea.
  Compile fix for wince
  Update QML PropertyAnimation::easing docs
  Add testcase for QTBUG-7730
  Add autotests for tab and backtab in Keys and KeyNavigation.
  Run signal expressions on attached property objects in correct scope
  Fixup test
  Add support for tab and backtab in KeyNavigation
  Mark QGraphicsItem position properties as FINAL
  Move the multimedia files to the correct place.
  Fix grammar stringifying "on" as "readonly"
  Improve grouped property error messages
  Don't mess with highlight size if highlightFollowsCurrentItem is false.
  Fix ListView contentHeight calculation.
  Remove Qt.playSound()
  Add formatting functions to QML's global Qt object.
  Signal handler requires exactly one value.
  QDeclarativeContext::contextProperty() should also access ids
  ...

2 files changed, 5 insertions, 2 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 6339813..a4de339 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -311,8 +311,11 @@ int main(int argc, char ** argv)
         usage();
     }
 
+    viewer.addLibraryPath(QCoreApplication::applicationDirPath());
+
     foreach (QString lib, libraries)
         viewer.addLibraryPath(lib);
+
     viewer.setNetworkCacheSize(cache);
     viewer.setRecordFile(recordfile);
     if (resizeview)
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); }