Merge remote branch 'origin/4.7' into qt-4.7-from-4.6

Conflicts:
	mkspecs/common/symbian/symbian.conf
	src/3rdparty/webkit/WebCore/WebCore.pro

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
new file mode 100644
index 0000000..67f1633
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+import org.webkit 1.0
+
+Grid {
+    columns: 2
+    Rectangle {
+        Text { id: label; x:10; y:170; color: "green"; text: "No image" }
+        border.color: "black"
+        width: 200
+        height: 200
+        WebView {
+            anchors.fill: parent
+            settings.autoLoadImages: false
+            url: "test-img.html"
+            MouseArea {
+                anchors.fill: parent
+                onClicked: { parent.settings.autoLoadImages=true; label.text=""; parent.reload.trigger() }
+            }
+        }
+    }
+}