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: (37 commits)
  Search for QML import libraries also in application directory
  Doc improvements
  Disable mouse-based selection in TextInput/TextEdit
  Rename qml executable to qmlviewer
  Don't crash if the target parent is destroyed.
  Introduce a threaded interpreter for QML binding bytecode
  Bug moved.
  doc
  doc
  Remove image example (covered in class docs)
  When changing Loader source, remove old item from scene immediately.
  Add missing .qmlproject files
  Fix folderlistmodel with qt namespace
  Renaming "Qml Launcher"  back to "QML Viewer"
  Rename some examples: proxyviewer -> networkaccessmanagerfactory,
  Regression fix for Loader anchors not working
  Make Qt.include() work for js files that have '.pragma library'
  doc fix
  Improve docs for Qt.quit()
  Prevent assignment of values (string, number, bool)  to signal handlers.
  ...

1 files changed, 4 insertions, 1 deletions

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 67440b6..1365cd7 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -786,7 +786,7 @@ void QDeclarativeScriptActionPrivate::execute()
 
     const QString &str = scriptStr.script();
     if (!str.isEmpty()) {
-        QDeclarativeExpression expr(scriptStr.context(), str, scriptStr.scopeObject());
+        QDeclarativeExpression expr(scriptStr.context(), scriptStr.scopeObject(), str);
         QDeclarativeData *ddata = QDeclarativeData::get(q);
         if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
             expr.setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
@@ -1947,6 +1947,9 @@ void QDeclarativePropertyAnimation::setTo(const QVariant &t)
 
     easing.period is only applicable if type is: Easing.InElastic, Easing.OutElastic,
     Easing.InOutElastic or Easing.OutInElastic.
+
+    See the \l {declarative/animation/easing}{easing} example for a demonstration of
+    the different easing settings.
 */
 QEasingCurve QDeclarativePropertyAnimation::easing() const
 {