diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2009-11-10 05:49:29 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2009-11-10 05:49:29 (GMT) |
commit | cd09e7e8edf9602d263fd6887e196a9e66fe913c (patch) | |
tree | ad4ca608648bb3b8795c27d9f0b1c8ad92224beb /tests/auto/declarative | |
parent | cd601659cace1fed926a7698b90c6867b471d396 (diff) | |
parent | 85fa17c58d3c8fd89242099b875faffedf4ee2b7 (diff) | |
download | Qt-cd09e7e8edf9602d263fd6887e196a9e66fe913c.zip Qt-cd09e7e8edf9602d263fd6887e196a9e66fe913c.tar.gz Qt-cd09e7e8edf9602d263fd6887e196a9e66fe913c.tar.bz2 |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r-- | tests/auto/declarative/qmlgraphicswebview/data/basic.ico | bin | 0 -> 318 bytes | |||
-rw-r--r-- | tests/auto/declarative/qmlgraphicswebview/data/forward.html | 12 | ||||
-rw-r--r-- | tests/auto/declarative/qmlgraphicswebview/data/javaScript.html | 11 | ||||
-rw-r--r-- | tests/auto/declarative/qmlgraphicswebview/data/loadError.qml | 5 | ||||
-rw-r--r-- | tests/auto/declarative/visual/webview/zooming/renderControl.html | 7 |
5 files changed, 35 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.ico b/tests/auto/declarative/qmlgraphicswebview/data/basic.ico Binary files differnew file mode 100644 index 0000000..8f3d05e --- /dev/null +++ b/tests/auto/declarative/qmlgraphicswebview/data/basic.ico diff --git a/tests/auto/declarative/qmlgraphicswebview/data/forward.html b/tests/auto/declarative/qmlgraphicswebview/data/forward.html new file mode 100644 index 0000000..030446a --- /dev/null +++ b/tests/auto/declarative/qmlgraphicswebview/data/forward.html @@ -0,0 +1,12 @@ +<html> +<head><title>Forward</title> +<link rel="icon" sizes="48x48" href="basic.png"> +</head> +<body leftmargin="0" marginwidth="0"> +<table width="123"> +<tbody> +<tr><td>This is more.</td></tr> +</tbody> +</table> +</body> +</html> diff --git a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html new file mode 100644 index 0000000..35270bc --- /dev/null +++ b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html @@ -0,0 +1,11 @@ +<html> +<head><title>JavaScript</title> +<link rel="icon" sizes="48x48" href="basic.png"> +<script type="text/javascript"> +<!-- +window.onload = function(){ window.status = "status here"; } +// --> +</script> +</head> +<body> +This is a JS test. diff --git a/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml b/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml new file mode 100644 index 0000000..1460f30 --- /dev/null +++ b/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml @@ -0,0 +1,5 @@ +import Qt 4.6 + +WebView { + url: "does-not-exist.html" +} diff --git a/tests/auto/declarative/visual/webview/zooming/renderControl.html b/tests/auto/declarative/visual/webview/zooming/renderControl.html new file mode 100644 index 0000000..1a01a33 --- /dev/null +++ b/tests/auto/declarative/visual/webview/zooming/renderControl.html @@ -0,0 +1,7 @@ +<html> +<body> +<h1>Render Control</h1> +<p> +This test shows how zooming and panning can be +optimized for speed over quality by delaying rendering. +<img src="qtlogo.png"> |