diff options
Diffstat (limited to 'tests/auto/declarative/qmlvisual')
12 files changed, 21 insertions, 17 deletions
diff --git a/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml index d3b4e6b..1cd0c7b 100644 --- a/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml +++ b/tests/auto/declarative/qmlvisual/webview/autosize/autosize.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import org.webkit 1.0 +import QtWebKit 1.0 // The WebView size is determined by the width, height, // preferredWidth, and preferredHeight properties. diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml index 916aa99..9ea2b64 100644 --- a/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml +++ b/tests/auto/declarative/qmlvisual/webview/javascript/evaluateJavaScript.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import org.webkit 1.0 +import QtWebKit 1.0 Column { property string skip: "WebView tests not counting until resources allocated to WebView maintenance" diff --git a/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml index 250c80d..0b78539 100644 --- a/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml +++ b/tests/auto/declarative/qmlvisual/webview/javascript/windowObjects.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import org.webkit 1.0 +import QtWebKit 1.0 Column { property string skip: "WebView tests not counting until resources allocated to WebView maintenance" diff --git a/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml index df08666..7c32704 100644 --- a/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.qml +++ b/tests/auto/declarative/qmlvisual/webview/settings/fontFamily.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" diff --git a/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml index 2403616..988ff64 100644 --- a/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml +++ b/tests/auto/declarative/qmlvisual/webview/settings/fontSize.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import org.webkit 1.0 +import QtWebKit 1.0 Grid { property string skip: "WebView tests not counting until resources allocated to WebView maintenance" diff --git a/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml index ec503bf..c465be8 100644 --- a/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml +++ b/tests/auto/declarative/qmlvisual/webview/settings/noAutoLoadImages.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import org.webkit 1.0 +import QtWebKit 1.0 Grid { property string skip: "WebView tests not counting until resources allocated to WebView maintenance" diff --git a/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml index f353fb4..11de161 100644 --- a/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.qml +++ b/tests/auto/declarative/qmlvisual/webview/settings/setFontFamily.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" 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 |