summaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qmltests/data/test4.html
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-06-20 13:38:11 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-20 18:27:44 +0200
commit25ccef35eb19fd656eba2a7abe5419972ed28552 (patch)
treee0c92532c3c70135d0a547675414e95d21a66822 /tests/auto/quick/qmltests/data/test4.html
parent3398abfc1b5b789d11592aada0b5860e36a50041 (diff)
parente91f09947b55dda8a13b2aeb0963836dee2ece8d (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts: src/3rdparty src/core/permission_manager_qt.cpp src/core/renderer/web_channel_ipc_transport.cpp src/core/renderer/web_channel_ipc_transport.h Change-Id: I25fd8ed7c433dadce44d8ac1e39f86e211ec25f0
Diffstat (limited to 'tests/auto/quick/qmltests/data/test4.html')
-rw-r--r--tests/auto/quick/qmltests/data/test4.html11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/quick/qmltests/data/test4.html b/tests/auto/quick/qmltests/data/test4.html
index 8f75af606..142b53668 100644
--- a/tests/auto/quick/qmltests/data/test4.html
+++ b/tests/auto/quick/qmltests/data/test4.html
@@ -12,6 +12,17 @@
<meta name="viewport" content="initial-scale=2.0"/>
</head>
<body>
+ <button onclick="scrollWin()", id="scroll">Click me to scroll!</button><br><br>
+
+ <script>
+ window.onload = function() {
+ document.getElementById("scroll").focus();
+ }
+
+ function scrollWin() {
+ window.scrollTo(0, 600);
+ }
+ </script>
<div id="content">
bla00<br/>
bla01<br/>