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, 2 insertions, 1 deletions

diff --git a/tests/auto/declarative/qdeclarativeqt/data/darker.qml b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
index f6333fe..738095d 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/darker.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/darker.qml
@@ -3,9 +3,10 @@ import Qt 4.7
 QtObject {
     property variant test1: Qt.darker(Qt.rgba(1, 0.8, 0.3))
     property variant test2: Qt.darker()
-    property variant test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 10)
+    property variant test3: Qt.darker(Qt.rgba(1, 0.8, 0.3), 2.8)
     property variant test4: Qt.darker("red");
     property variant test5: Qt.darker("perfectred"); // Non-existant color
     property variant test6: Qt.darker(10);
+    property variant test7: Qt.darker(Qt.rgba(1, 0.8, 0.3), 2.8, 10)
 }