Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1

Conflicts:
	tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
	tools/assistant/tools/assistant/assistant.pro
	tools/assistant/tools/assistant/centralwidget.cpp
	tools/assistant/tools/assistant/helpviewer_qtb.cpp
	tools/assistant/tools/assistant/helpviewer_qwv.cpp
	tools/assistant/tools/assistant/mainwindow.cpp

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
new file mode 100644
index 0000000..52a569e
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+import org.webkit 1.0
+
+Rectangle {
+    width: 200
+    height: 250
+    clip: true
+    WebView {
+        id: webview
+        width: 400
+        url: "renderControl.html"
+        SequentialAnimation on x {
+                loops: Animation.Infinite
+                NumberAnimation { from: 100; to: 0; duration: 200 }
+                PropertyAction { target: webview; property: "renderingEnabled"; value: false }
+                NumberAnimation { from: 0; to: -100; duration: 200 }
+                PropertyAction { target: webview; property: "renderingEnabled"; value: true }
+                NumberAnimation { from: -100; to: 100; duration: 400 }
+            }
+    }
+}