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: (131 commits)
  Avoid many unnecessary allocations, so so that paint engines attached to pixmaps
  Doc
  Fix autotests
  Fix autotests (remove import Qt.widgets)
  Add missing qml file to qdeclarativemousearea
  Doc fix
  Clean up example code, add white background behind text
  Update mouse area qmlvisual test to follow change QTBUG-10162
  Fix autotest bug in MouseArea
  Avoid emitting release when the mouse is ungrabbed
  Resize qmlruntime window to new dimensions when orientation changes
  Compile with opengl enabled.
  Avoid repeated create/destroy at top list boundary with sub-pixel movement.
  Call QDeclarativeItem::geometryChanged() base implementation
  qdoc fixes.
  Avoid warnings as delegates with bindings to parent are created and destroyed.
  qdoc fixes
  TextInput echoMode doc.
  Make sure to call base class implementation.
  More cleanup
  ...

1 files changed, 10 insertions, 5 deletions

diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp
index 656c62b..0258b3c 100644
--- a/src/declarative/util/qdeclarativetimeline.cpp
+++ b/src/declarative/util/qdeclarativetimeline.cpp
@@ -255,7 +255,6 @@ qreal QDeclarativeTimeLinePrivate::value(const Op &op, int time, qreal base, boo
 /*!
     \internal
     \class QDeclarativeTimeLine
-    \ingroup group_animation
     \brief The QDeclarativeTimeLine class provides a timeline for controlling animations.
 
     QDeclarativeTimeLine is similar to QTimeLine except:
@@ -387,7 +386,10 @@ void QDeclarativeTimeLine::set(QDeclarativeTimeLineValue &timeLineValue, qreal v
 */
 int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal velocity, qreal acceleration)
 {
-    if ((velocity > 0.0f) ==  (acceleration > 0.0f))
+    if (acceleration == 0.0f)
+        return -1;
+
+    if ((velocity > 0.0f) == (acceleration > 0.0f))
         acceleration = acceleration * -1.0f;
 
     int time = static_cast<int>(-1000 * velocity / acceleration);
@@ -410,13 +412,16 @@ int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal
 */
 int QDeclarativeTimeLine::accel(QDeclarativeTimeLineValue &timeLineValue, qreal velocity, qreal acceleration, qreal maxDistance)
 {
-    Q_ASSERT(acceleration >= 0.0f && maxDistance >= 0.0f);
+    if (maxDistance == 0.0f || acceleration == 0.0f)
+        return -1;
+
+    Q_ASSERT(acceleration > 0.0f && maxDistance > 0.0f);
 
     qreal maxAccel = (velocity * velocity) / (2.0f * maxDistance);
     if (maxAccel > acceleration)
         acceleration = maxAccel;
 
-    if ((velocity > 0.0f) ==  (acceleration > 0.0f))
+    if ((velocity > 0.0f) == (acceleration > 0.0f))
         acceleration = acceleration * -1.0f;
 
     int time = static_cast<int>(-1000 * velocity / acceleration);
@@ -438,6 +443,7 @@ int QDeclarativeTimeLine::accelDistance(QDeclarativeTimeLineValue &timeLineValue
 {
     if (distance == 0.0f || velocity == 0.0f)
         return -1;
+
     Q_ASSERT((distance >= 0.0f) == (velocity >= 0.0f));
 
     int time = static_cast<int>(1000 * (2.0f * distance) / velocity);
@@ -868,7 +874,6 @@ void QDeclarativeTimeLine::remove(QDeclarativeTimeLineObject *v)
 /*!
     \internal
     \class QDeclarativeTimeLineValue
-    \ingroup group_animation
     \brief The QDeclarativeTimeLineValue class provides a value that can be modified by QDeclarativeTimeLine.
 */