summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qmlvisual/webview/zooming
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-10-29 08:03:21 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-10-29 08:03:21 (GMT)
commit2ce656569946f31d0da6b4f5877b69d7afe06d93 (patch)
tree1e6a7d350476babb0be18ff90053ebef77324fa3 /tests/auto/declarative/qmlvisual/webview/zooming
parent05701150d5d8c619288486593363f0b52a8eda49 (diff)
downloadQt-2ce656569946f31d0da6b4f5877b69d7afe06d93.zip
Qt-2ce656569946f31d0da6b4f5877b69d7afe06d93.tar.gz
Qt-2ce656569946f31d0da6b4f5877b69d7afe06d93.tar.bz2
Update webview visual tests to new skip mode
New mode requires them to at least compile. Now that I've noticed this, removing that check on compile failures in QDeclarativeTester. Task-number: QTBUG-14792
Diffstat (limited to 'tests/auto/declarative/qmlvisual/webview/zooming')
-rw-r--r--tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml12
-rw-r--r--tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml2
-rw-r--r--tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml4
-rw-r--r--tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml4
-rw-r--r--tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml2
5 files changed, 14 insertions, 10 deletions
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
index 5e55d46..a2b11ac 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml
@@ -1,11 +1,11 @@
import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
WebView {
property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
- width: 200
- height: 250
- url: "resolution.html"
- webPageWidth: 400
- preferredWidth: 200
+ //width: 200
+ //height: 250
+ //url: "resolution.html"
+ // webPageWidth: 400
+ // preferredWidth: 200
}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
index a8e5b59..c07f1e1 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml
@@ -1,5 +1,5 @@
import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
Rectangle {
property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
index fe33f3f..cf5f50f 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml
@@ -1,8 +1,9 @@
import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
WebView {
property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
+ /*
width: 200 * zoomFactor
height: 250 * zoomFactor
scale: 1/zoomFactor
@@ -14,4 +15,5 @@ WebView {
NumberAnimation { from: 1; to: 5; duration: 2000 }
NumberAnimation { from: 5; to: 1; duration: 2000 }
}
+ */
}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
index 43551e5..03c925f 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml
@@ -1,5 +1,5 @@
import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
WebView {
property string skip: "WebView tests not counting until resources allocated to WebView maintenance"
@@ -7,9 +7,11 @@ WebView {
height: 250
url: "zoomTextOnly.html"
settings.zoomTextOnly: true
+ /*
SequentialAnimation on zoomFactor {
loops: Animation.Infinite
NumberAnimation { from: 2; to: 0.25; duration: 1000 }
NumberAnimation { from: 0.25; to: 2; duration: 1000 }
}
+ */
}
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
index 6cfd5eb..03fd780 100644
--- a/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
+++ b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml
@@ -1,5 +1,5 @@
import QtQuick 1.0
-import org.webkit 1.0
+import QtWebKit 1.0
// Note that zooming is better done using zoomFactor and careful
// control of rendering to avoid excessive re-rendering during