Merge branch 'master' of git:qt/qt-qml

Conflicts:
	src/declarative/graphicsitems/qdeclarativeparticles.cpp

1 files changed, 33 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml b/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
new file mode 100644
index 0000000..3dd4e51
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativewebview/data/propertychanges.qml
@@ -0,0 +1,33 @@
+import Qt 4.6
+
+Item {
+    width: 240
+    height: 160
+    Grid {
+        anchors.fill: parent
+        objectName: "newWindowParent"
+        id: newWindowParent
+    }
+
+    Row {
+        anchors.fill: parent
+        id: oldWindowParent
+        objectName: "oldWindowParent"
+    }
+
+    Loader {
+        sourceComponent: webViewComponent
+    }
+    Component {
+            id: webViewComponent
+            WebView {
+                id: webView
+                objectName: "webView"
+                newWindowComponent: webViewComponent
+                newWindowParent: oldWindowParent         
+                url: "basic.html"
+                renderingEnabled: true
+                pressGrabTime: 200
+            }
+    }
+}
\ No newline at end of file