diff options
Diffstat (limited to 'tests/auto/declarative/qmlvisual/webview/zooming')
5 files changed, 19 insertions, 10 deletions
diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml index 1617bda..a2b11ac 100644 --- a/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml +++ b/tests/auto/declarative/qmlvisual/webview/zooming/pageWidth.qml @@ -1,10 +1,11 @@ import QtQuick 1.0 -import org.webkit 1.0 +import QtWebKit 1.0 WebView { - width: 200 - height: 250 - url: "resolution.html" - webPageWidth: 400 - preferredWidth: 200 + property string skip: "WebView tests not counting until resources allocated to WebView maintenance" + //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 e46f726..c07f1e1 100644 --- a/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml +++ b/tests/auto/declarative/qmlvisual/webview/zooming/renderControl.qml @@ -1,7 +1,8 @@ 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" width: 200 height: 250 clip: true diff --git a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml index e9189db..cf5f50f 100644 --- a/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml +++ b/tests/auto/declarative/qmlvisual/webview/zooming/resolution.qml @@ -1,7 +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 @@ -13,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 52222be..03c925f 100644 --- a/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml +++ b/tests/auto/declarative/qmlvisual/webview/zooming/zoomTextOnly.qml @@ -1,14 +1,17 @@ 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: "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 dc973c2..03fd780 100644 --- a/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml +++ b/tests/auto/declarative/qmlvisual/webview/zooming/zooming.qml @@ -1,10 +1,11 @@ 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 // zoom animations. This test is written for simplicity. WebView { + property string skip: "WebView tests not counting until resources allocated to WebView maintenance" width: 200 height: 250 Behavior on x { NumberAnimation { } } |