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

Conflicts:
	doc/src/declarative/examples.qdoc
	doc/src/declarative/focus.qdoc
	doc/src/declarative/modules.qdoc
	doc/src/declarative/network.qdoc
	doc/src/declarative/qdeclarativedebugging.qdoc
	doc/src/declarative/qdeclarativei18n.qdoc
	doc/src/declarative/qmlruntime.qdoc
	doc/src/declarative/tutorial.qdoc
	tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
new file mode 100644
index 0000000..8c52aff
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+import org.webkit 1.0
+
+Column {
+    WebView {
+        width: 200
+        height: 200
+        url: "test-objects.html"
+        javaScriptWindowObjects:
+            QtObject {
+                property string text: btntext.text
+                WebView.windowObjectName: "qmltext"
+            }
+    }
+    Row {
+        Text { text: "Input:" }
+        Rectangle {
+            width: btntext.width+10
+            height: btntext.height+10
+            border.color: "black"
+            TextInput {
+                id: btntext
+                text: "Blah"
+            }
+        }
+    }
+}