diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 14:08:21 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 14:08:21 (GMT) |
commit | 48edd0b663b29413452389c906487cc9b0408b29 (patch) | |
tree | 0b5e3e9de4c45adec46a80845ed640ee16ba46b1 /tests/auto/declarative/visual/webview/zooming | |
parent | 8bc0456491e5a7e1fc677fce6e76932ab0d923e8 (diff) | |
parent | 6f09fc3a475eb2e1c843f4aebe7ea0d15182ac1d (diff) | |
download | Qt-48edd0b663b29413452389c906487cc9b0408b29.zip Qt-48edd0b663b29413452389c906487cc9b0408b29.tar.gz Qt-48edd0b663b29413452389c906487cc9b0408b29.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (100 commits)
Update QML PropertyAnimation::easing docs
Add testcase for QTBUG-7730
Add autotests for tab and backtab in Keys and KeyNavigation.
Run signal expressions on attached property objects in correct scope
Fixup test
Add support for tab and backtab in KeyNavigation
Mark QGraphicsItem position properties as FINAL
Move the multimedia files to the correct place.
Fix grammar stringifying "on" as "readonly"
Improve grouped property error messages
Don't mess with highlight size if highlightFollowsCurrentItem is false.
Fix ListView contentHeight calculation.
Remove Qt.playSound()
Add formatting functions to QML's global Qt object.
Signal handler requires exactly one value.
QDeclarativeContext::contextProperty() should also access ids
Compile without QVariant::EasingCurve in Qt 4.6.2.
Documented view behavior when items are removed from start of view.
Fix tests failing due to javascript eval errors.
Remove unnecessary additional hash of QDeclarativeGridViewAttached
...
Diffstat (limited to 'tests/auto/declarative/visual/webview/zooming')
5 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/declarative/visual/webview/zooming/pageWidth.qml b/tests/auto/declarative/visual/webview/zooming/pageWidth.qml index 86dd7d2..4a876dd 100644 --- a/tests/auto/declarative/visual/webview/zooming/pageWidth.qml +++ b/tests/auto/declarative/visual/webview/zooming/pageWidth.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import org.webkit 1.0 WebView { width: 200 diff --git a/tests/auto/declarative/visual/webview/zooming/renderControl.qml b/tests/auto/declarative/visual/webview/zooming/renderControl.qml index 0c8bb3b..49eb91b 100644 --- a/tests/auto/declarative/visual/webview/zooming/renderControl.qml +++ b/tests/auto/declarative/visual/webview/zooming/renderControl.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import org.webkit 1.0 Rectangle { width: 200 diff --git a/tests/auto/declarative/visual/webview/zooming/resolution.qml b/tests/auto/declarative/visual/webview/zooming/resolution.qml index a9d4e3a..8542768 100644 --- a/tests/auto/declarative/visual/webview/zooming/resolution.qml +++ b/tests/auto/declarative/visual/webview/zooming/resolution.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import org.webkit 1.0 WebView { width: 200 * zoomFactor diff --git a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml index 4455b43..c2e9348 100644 --- a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml +++ b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import org.webkit 1.0 WebView { width: 200 diff --git a/tests/auto/declarative/visual/webview/zooming/zooming.qml b/tests/auto/declarative/visual/webview/zooming/zooming.qml index 0ea9131..9f0b865 100644 --- a/tests/auto/declarative/visual/webview/zooming/zooming.qml +++ b/tests/auto/declarative/visual/webview/zooming/zooming.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import org.webkit 1.0 // Note that zooming is better done using zoomFactor and careful // control of rendering to avoid excessive re-rendering during |