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

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (237 commits)
  Fix animation tests after merge
  Remove duplicated test.
  Add missing test file.
  Changing width of RTL positioner doesn't relayout
  Fix TextInput auto test failure on mac.
  PinchArea and Flickable don't work well enough together
  Do not set focus unnecessarily at window activation in Symbian
  QS60Style: Regression in drawing dialog background
  QS60Style: Support menu separator (pt.2)
  Fix auto test failure.
  Support for new softkey in Symbian^3
  Once Image sourceSize is set there is no way to clear it.
  Rotation transform with NaN angle can cause crash
  QSoftkeyManager auto test update
  Fixed not switching to MeeGo graphicssystem.
  Canceling image download while reading causes crash
  Fix width of TextInput micro focus rectangle.
  Return correct boundaries reasons from QTextBoundaryFinder.
  GridView jumps to beginning of list when resized
  Fixed rounding of coordinates pre-transformation in CG paintengine.
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index e584476..41f8fe5 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -76,7 +76,7 @@ public:
     \since 4.7
     \brief The Behavior element allows you to specify a default animation for a property change.
 
-    A Behavior defines the default animation to be applied whenever a 
+    A Behavior defines the default animation to be applied whenever a
     particular property value changes.
 
     For example, the following Behavior defines a NumberAnimation to be run
@@ -93,7 +93,7 @@ public:
     Behavior, the \l Transition animation overrides the Behavior for that
     state change.
 
-    \sa {QML Animation}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative
+    \sa {QML Animation and Transitions}, {declarative/animation/behaviors}{Behavior example}, QtDeclarative
 */
 
 
@@ -205,7 +205,7 @@ void QDeclarativeBehavior::write(const QVariant &value)
     d->animation->qtAnimation()->start();
     d->blockRunningChanged = false;
     if (!after.contains(d->property))
-        QDeclarativePropertyPrivate::write(d->property, value, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);    
+        QDeclarativePropertyPrivate::write(d->property, value, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding);
 }
 
 void QDeclarativeBehavior::setTarget(const QDeclarativeProperty &property)