summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-11-10 05:55:50 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-11-10 05:55:50 (GMT)
commit7438c0d663c43935093276ab00159afad9caa902 (patch)
tree54a5b19272221e3a8e031292217fa8aca42bd886
parent27cf19d3234336edc2c89ebc010808de25136d1e (diff)
parentde940e6601eca077a89c7ceb63234d934525d63a (diff)
downloadQt-7438c0d663c43935093276ab00159afad9caa902.zip
Qt-7438c0d663c43935093276ab00159afad9caa902.tar.gz
Qt-7438c0d663c43935093276ab00159afad9caa902.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--.gitignore6
-rw-r--r--demos/declarative/webbrowser/webbrowser.qml43
-rw-r--r--examples/declarative/webview/qml-in-html.qml4
-rw-r--r--src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp3
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspainteditem.cpp38
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspainteditem_p.h4
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h3
-rw-r--r--src/declarative/graphicsitems/qmlgraphicswebview.cpp95
-rw-r--r--src/declarative/graphicsitems/qmlgraphicswebview_p.h10
-rw-r--r--tests/auto/declarative/.gitignore1
-rw-r--r--tests/auto/declarative/qmlgraphicswebview/data/basic.icobin0 -> 318 bytes
-rw-r--r--tests/auto/declarative/qmlgraphicswebview/data/forward.html12
-rw-r--r--tests/auto/declarative/qmlgraphicswebview/data/javaScript.html11
-rw-r--r--tests/auto/declarative/qmlgraphicswebview/data/loadError.qml5
-rw-r--r--tests/auto/declarative/visual/flickable/Day.qml26
-rw-r--r--tests/auto/declarative/visual/flickable/cork.jpgbin22211 -> 0 bytes
-rw-r--r--tests/auto/declarative/visual/flickable/data-X11/flickable.0.pngbin115546 -> 0 bytes
-rw-r--r--tests/auto/declarative/visual/flickable/data-X11/flickable.1.pngbin115627 -> 0 bytes
-rw-r--r--tests/auto/declarative/visual/flickable/data-X11/flickable.2.pngbin116034 -> 0 bytes
-rw-r--r--tests/auto/declarative/visual/flickable/data-X11/flickable.qml791
-rw-r--r--tests/auto/declarative/visual/flickable/data/flickable.0.pngbin116681 -> 0 bytes
-rw-r--r--tests/auto/declarative/visual/flickable/data/flickable.1.pngbin116856 -> 0 bytes
-rw-r--r--tests/auto/declarative/visual/flickable/data/flickable.2.pngbin117276 -> 0 bytes
-rw-r--r--tests/auto/declarative/visual/flickable/data/flickable.qml791
-rw-r--r--tests/auto/declarative/visual/flickable/flickable.qml55
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.pngbin0 -> 1252 bytes
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.pngbin0 -> 1254 bytes
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.pngbin0 -> 1252 bytes
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.pngbin0 -> 1252 bytes
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml1199
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.pngbin0 -> 1774 bytes
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.pngbin0 -> 1767 bytes
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.pngbin0 -> 1780 bytes
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml1107
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml30
-rw-r--r--tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml30
-rw-r--r--tests/auto/declarative/visual/webview/zooming/renderControl.html7
37 files changed, 2526 insertions, 1745 deletions
diff --git a/.gitignore b/.gitignore
index f75cc75..57f3417 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,6 +78,12 @@ bin/cetest*
bin/collectiongenerator
bin/helpconverter
bin/helpgenerator
+bin/kmap2qmap*
+bin/qlalr*
+bin/qmlconv*
+bin/qmldebugger*
+bin/qmlviewer*
+bin/qttracereplay*
configure.cache
config.status
mkspecs/default
diff --git a/demos/declarative/webbrowser/webbrowser.qml b/demos/declarative/webbrowser/webbrowser.qml
index 6be3e09..8a01af5 100644
--- a/demos/declarative/webbrowser/webbrowser.qml
+++ b/demos/declarative/webbrowser/webbrowser.qml
@@ -191,15 +191,37 @@ Item {
}
url: fixUrl(webBrowser.urlString)
- smooth: true
+ smooth: false // We don't want smooth scaling, since we only scale during (fast) transitions
+ smoothCache: true // We do want smooth rendering
fillColor: "white"
focus: true
+ function doZoom(zoom,centerX,centerY)
+ {
+ if (centerX) {
+ var sc = zoom/zoomFactor;
+ scaleAnim.to = sc;
+ flickVX.from = flickable.viewportX
+ flickVX.to = Math.min(Math.max(0,centerX-flickable.width/2),webView.width*sc-flickable.width)
+ finalX.value = Math.min(Math.max(0,centerX-flickable.width/2),webView.width*sc-flickable.width)
+ flickVY.from = flickable.viewportY
+ flickVY.to = Math.min(Math.max(0,centerY-flickable.height/2),webView.height*sc-flickable.height)
+ finalY.value = Math.min(Math.max(0,centerY-flickable.height/2),webView.height*sc-flickable.height)
+ finalZoom.value = zoom
+ quickZoom.start()
+ }
+ }
+
preferredWidth: flickable.width
- webPageWidth: 980
+ preferredHeight: flickable.height
+ zoomFactor: flickable.width > 980 ? flickable.width : flickable.width/980
onUrlChanged: { if (url != null) { webBrowser.urlString = url.toString(); } }
- onDoubleClick: { heuristicZoom(clickX,clickY) }
+ onDoubleClick: { if (!heuristicZoom(clickX,clickY,2.5)) {
+ var zf = flickable.width > 980 ? flickable.width : flickable.width/980;
+ doZoom(zf,clickX/zoomFactor*zf,clickY/zoomFactor*zf)
+ }
+ }
SequentialAnimation {
id: quickZoom
@@ -269,20 +291,7 @@ Item {
value: true
}
}
- onZooming: {
- if (centerX) {
- var sc = zoom/zoomFactor;
- scaleAnim.to = sc;
- flickVX.from = flickable.viewportX
- flickVX.to = Math.min(Math.max(0,centerX-flickable.width/2),webView.width*sc-flickable.width)
- finalX.value = Math.min(Math.max(0,centerX-flickable.width/2),webView.width*sc-flickable.width)
- flickVY.from = flickable.viewportY
- flickVY.to = Math.min(Math.max(0,centerY-flickable.height/2),webView.height*sc-flickable.height)
- finalY.value = Math.min(Math.max(0,centerY-flickable.height/2),webView.height*sc-flickable.height)
- finalZoom.value = zoom
- quickZoom.start()
- }
- }
+ onZoomTo: doZoom(zoom,centerX,centerY)
}
Rectangle {
id: webViewTint
diff --git a/examples/declarative/webview/qml-in-html.qml b/examples/declarative/webview/qml-in-html.qml
index 43cc61b..a2f2f2a 100644
--- a/examples/declarative/webview/qml-in-html.qml
+++ b/examples/declarative/webview/qml-in-html.qml
@@ -12,8 +12,8 @@ Rectangle {
id: web
width: 250
height: 420
- scale: 0.75
- smooth: true
+ zoomFactor: 0.75
+ smoothCache: true
settings.pluginsEnabled: true
html: "<html>\
<body bgcolor=white>\
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index f706d77..b580116 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -1238,7 +1238,8 @@ PassRefPtr<Widget> FrameLoaderClientQt::createPlugin(const IntSize& pluginSize,
parentWidget = qobject_cast<QWidget*>(m_webFrame->page()->d->client->pluginParent());
else
parentWidget = 0; // The plug-in won't be fully functional because the QWebView doesn't exist.
- widget->setParent(parentWidget);
+ if (parentWidget) // don't reparent to nothing (i.e. keep whatever parent createPlugin() chose.
+ widget->setParent(parentWidget);
RefPtr<QtPluginWidget> w = adoptRef(new QtPluginWidget());
w->setPlatformWidget(widget);
// Make sure it's invisible until properly placed into the layout
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
index a0d9b09..2c849c8 100644
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem.cpp
@@ -209,17 +209,12 @@ void QmlGraphicsPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *
++inpaint;
- QRectF clipf = p->clipRegion().boundingRect();
- if (clipf.isEmpty())
- clipf = mapToScene(content).boundingRect(); // ### Inefficient: Maps toScene and then fromScene
- else
- clipf = mapToScene(clipf).boundingRect();
-
- const QRect clip = mapFromScene(clipf).boundingRect().toRect();
+ const QRect clip = p->clipRegion().boundingRect();
QRegion topaint(clip);
topaint &= content;
QRegion uncached(content);
+ p->setRenderHints(QPainter::SmoothPixmapTransform, d->smooth);
int cachesize=0;
for (int i=0; i<d->imagecache.count(); ++i) {
@@ -229,7 +224,7 @@ void QmlGraphicsPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *
if (!d->cachefrozen) {
if (!d->imagecache[i]->dirty.isNull() && topaint.contains(d->imagecache[i]->dirty)) {
QPainter qp(&d->imagecache[i]->image);
- qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+ qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache);
qp.translate(-area.x(), -area.y());
if (d->fillColor.isValid()){
if(d->fillColor.alpha() < 255){
@@ -285,7 +280,7 @@ void QmlGraphicsPaintedItem::paint(QPainter *p, const QStyleOptionGraphicsItem *
img.fill(d->fillColor);
{
QPainter qp(&img);
- qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+ qp.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform, d->smoothCache);
qp.translate(-r.x(),-r.y());
drawContents(&qp, r);
@@ -383,5 +378,30 @@ QColor QmlGraphicsPaintedItem::fillColor() const
return d->fillColor;
}
+/*!
+ \qmlproperty bool PaintedItem::smoothCache
+
+ Controls whether the cached tiles of which the item is composed are
+ rendered smoothly when they are generated.
+
+ This is in addition toe Item::smooth, which controls the smooth painting of
+ the already-painted cached tiles under transformation.
+*/
+bool QmlGraphicsPaintedItem::smoothCache() const
+{
+ Q_D(const QmlGraphicsPaintedItem);
+ return d->smoothCache;
+}
+
+void QmlGraphicsPaintedItem::setSmoothCache(bool on)
+{
+ Q_D(QmlGraphicsPaintedItem);
+ if (d->smoothCache != on) {
+ d->smoothCache = on;
+ clearCache();
+ }
+}
+
+
QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
index 99873a7..8d629b3 100644
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p.h
@@ -59,6 +59,7 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsPaintedItem : public QmlGraphicsItem
Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize)
Q_PROPERTY(QColor fillColor READ fillColor WRITE setFillColor NOTIFY fillColorChanged)
Q_PROPERTY(int cacheSize READ cacheSize WRITE setCacheSize)
+ Q_PROPERTY(bool smoothCache READ smoothCache WRITE setSmoothCache)
public:
QmlGraphicsPaintedItem(QmlGraphicsItem *parent=0);
@@ -70,6 +71,9 @@ public:
int cacheSize() const;
void setCacheSize(int pixels);
+ bool smoothCache() const;
+ void setSmoothCache(bool on);
+
QColor fillColor() const;
void setFillColor(const QColor&);
diff --git a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
index a744557..a938ecf 100644
--- a/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspainteditem_p_p.h
@@ -63,7 +63,7 @@ class QmlGraphicsPaintedItemPrivate : public QmlGraphicsItemPrivate
public:
QmlGraphicsPaintedItemPrivate()
- : max_imagecache_size(100000), fillColor(Qt::transparent), cachefrozen(false)
+ : max_imagecache_size(100000), fillColor(Qt::transparent), cachefrozen(false), smoothCache(true)
{
}
@@ -82,6 +82,7 @@ public:
QSize contentsSize;
QColor fillColor;
bool cachefrozen;
+ bool smoothCache;
};
QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index 827144d..14c4352 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
@@ -166,7 +166,7 @@ class QmlGraphicsWebViewPrivate : public QmlGraphicsPaintedItemPrivate
public:
QmlGraphicsWebViewPrivate()
- : QmlGraphicsPaintedItemPrivate(), page(0), preferredwidth(0), pagewidth(0),
+ : QmlGraphicsPaintedItemPrivate(), page(0), preferredwidth(0), preferredheight(0),
progress(1.0), status(QmlGraphicsWebView::Null), pending(PendingNone),
newWindowComponent(0), newWindowParent(0),
windowObjects(this),
@@ -177,8 +177,7 @@ public:
QUrl url; // page url might be different if it has not loaded yet
QWebPage *page;
- int preferredwidth;
- int pagewidth;
+ int preferredwidth, preferredheight;
qreal progress;
QmlGraphicsWebView::Status status;
QString statusText;
@@ -227,7 +226,8 @@ public:
width: 490
height: 400
scale: 0.5
- smooth: true
+ smooth: false
+ smoothCache: true
}
\endqml
@@ -341,22 +341,15 @@ void QmlGraphicsWebView::pageUrlChanged()
{
Q_D(QmlGraphicsWebView);
- // Reset zooming to full
- qreal zf = 1.0;
if (d->preferredwidth) {
- if (d->pagewidth)
- zf = qreal(d->preferredwidth)/d->pagewidth;
- page()->mainFrame()->setZoomFactor(zf);
page()->setViewportSize(QSize(d->preferredwidth,-1));
} else {
- page()->mainFrame()->setZoomFactor(zf);
page()->setViewportSize(QSize(-1,-1));
}
- emit zooming(zf,0,0);
expandToWebPage();
if ((d->url.isEmpty() && page()->mainFrame()->url() != QUrl(QLatin1String("about:blank")))
- || d->url != page()->mainFrame()->url() && !page()->mainFrame()->url().isEmpty())
+ || (d->url != page()->mainFrame()->url() && !page()->mainFrame()->url().isEmpty()))
{
d->url = page()->mainFrame()->url();
if (d->url == QUrl(QLatin1String("about:blank")))
@@ -406,15 +399,11 @@ void QmlGraphicsWebView::setUrl(const QUrl &url)
if (isComponentComplete()) {
d->url = url;
- qreal zf = 1.0;
if (d->preferredwidth) {
- if (d->pagewidth)
- zf = qreal(d->preferredwidth)/d->pagewidth;
page()->setViewportSize(QSize(d->preferredwidth,-1));
} else {
page()->setViewportSize(QSize(-1,-1));
}
- page()->mainFrame()->setZoomFactor(zf);
QUrl seturl = url;
if (seturl.isEmpty())
seturl = QUrl(QLatin1String("about:blank"));
@@ -444,35 +433,27 @@ void QmlGraphicsWebView::setPreferredWidth(int iw)
{
Q_D(QmlGraphicsWebView);
if (d->preferredwidth == iw) return;
- if (d->pagewidth) {
- if (d->preferredwidth) {
- setZoomFactor(zoomFactor()*iw/d->preferredwidth);
- } else {
- setZoomFactor(qreal(iw)/d->pagewidth);
- }
- }
d->preferredwidth = iw;
expandToWebPage();
emit preferredWidthChanged();
}
/*!
- \qmlproperty int WebView::webPageWidth
- This property holds the page width suggested to the web engine. The zoomFactor
- will be changed to fit this with in preferredWidth.
+ \qmlproperty int WebView::preferredHeight
+ This property holds the ideal height for displaying the current URL.
+ This only affects the area zoomed by heuristicZoom().
*/
-int QmlGraphicsWebView::webPageWidth() const
+int QmlGraphicsWebView::preferredHeight() const
{
Q_D(const QmlGraphicsWebView);
- return d->pagewidth;
+ return d->preferredheight;
}
-
-void QmlGraphicsWebView::setWebPageWidth(int pw)
+void QmlGraphicsWebView::setPreferredHeight(int ih)
{
Q_D(QmlGraphicsWebView);
- if (d->pagewidth == pw) return;
- d->pagewidth = pw;
- expandToWebPage();
+ if (d->preferredheight == ih) return;
+ d->preferredheight = ih;
+ emit preferredHeightChanged();
}
/*!
@@ -715,18 +696,38 @@ void QmlGraphicsWebView::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
delete me;
}
-void QmlGraphicsWebView::heuristicZoom(int clickX, int clickY)
+/*!
+ \qmlmethod bool WebView::heuristicZoom(clickX,clickY,maxzoom)
+
+ Finds a zoom that:
+ \list
+ \i shows a whole item
+ \i includes (\a clickX, \a clickY)
+ \i fits into the preferredWidth and preferredHeight
+ \i zooms by no more than \a maxzoom
+ \i is more than 20% above the current zoom
+ \endlist
+
+ If such a zoom exists, emits zoomTo(zoom,centerX,centerY) and returns true; otherwise,
+ no signal is emitted and returns false.
+*/
+bool QmlGraphicsWebView::heuristicZoom(int clickX, int clickY, qreal maxzoom)
{
Q_D(QmlGraphicsWebView);
qreal ozf = zoomFactor();
- QRect showarea = elementAreaAt(clickX, clickY, 1, 1);
- qreal z = qreal(preferredWidth())*ozf/showarea.width()*.95;
- if ((z/ozf > 0.99 && z/ozf <1.01) || z < qreal(d->preferredwidth)/d->pagewidth) {
- // zoom out
- z = qreal(d->preferredwidth)/d->pagewidth;
+ if (ozf >= maxzoom)
+ return false;
+ QRect showarea = elementAreaAt(clickX, clickY, d->preferredwidth/maxzoom, d->preferredheight/maxzoom);
+ qreal z = qMin(qreal(d->preferredwidth)*ozf/showarea.width(),qreal(d->preferredheight)*ozf/showarea.height());
+ if (z > maxzoom)
+ z = maxzoom;
+ if (z/ozf > 1.2) {
+ QRectF r(showarea.left()/ozf*z, showarea.top()/ozf*z, showarea.width()/ozf*z, showarea.height()/ozf*z);
+ emit zoomTo(z,r.x()+r.width()/2, r.y()+r.height()/2);
+ return true;
+ } else {
+ return false;
}
- QRectF r(showarea.left()/ozf*z, showarea.top()/ozf*z, showarea.width()/ozf*z, showarea.height()/ozf*z);
- emit zooming(z,r.x()+r.width()/2, r.y()+r.height()/2);
}
void QmlGraphicsWebView::mousePressEvent(QGraphicsSceneMouseEvent *event)
@@ -911,7 +912,7 @@ void QmlGraphicsWebView::setZoomFactor(qreal factor)
return;
page()->mainFrame()->setZoomFactor(factor);
- page()->setViewportSize(QSize(d->pagewidth*factor,-1));
+ page()->setViewportSize(QSize(d->preferredwidth ? d->preferredwidth : -1,-1));
expandToWebPage();
emit zoomFactorChanged();
@@ -1239,15 +1240,15 @@ void QmlGraphicsWebView::setNewWindowParent(QmlGraphicsItem *parent)
QRect QmlGraphicsWebView::elementAreaAt(int x, int y, int maxwidth, int maxheight) const
{
QWebHitTestResult hit = page()->mainFrame()->hitTestContent(QPoint(x,y));
+ QRect rv = hit.boundingRect();
QWebElement element = hit.enclosingBlockElement();
- QWebElement parent = element.parent();
if (maxwidth<=0) maxwidth = INT_MAX;
if (maxheight<=0) maxheight = INT_MAX;
- while (!parent.isNull() && parent.geometry().width() <= maxwidth && parent.geometry().height() <= maxheight) {
- element = parent;
- parent = element.parent();
+ while (!element.parent().isNull() && element.geometry().width() <= maxwidth && element.geometry().height() <= maxheight) {
+ rv = element.geometry();
+ element = element.parent();
}
- return element.geometry();
+ return rv;
}
/*!
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
index 6373246..7c9faf4 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
@@ -94,7 +94,7 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsWebView : public QmlGraphicsPaintedItem
Q_PROPERTY(QString html READ html WRITE setHtml)
Q_PROPERTY(int preferredWidth READ preferredWidth WRITE setPreferredWidth NOTIFY preferredWidthChanged)
- Q_PROPERTY(int webPageWidth READ webPageWidth WRITE setWebPageWidth)
+ Q_PROPERTY(int preferredHeight READ preferredHeight WRITE setPreferredHeight NOTIFY preferredHeightChanged)
Q_PROPERTY(int pixelCacheSize READ pixelCacheSize WRITE setPixelCacheSize)
Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
@@ -127,11 +127,12 @@ public:
qreal zoomFactor() const;
void setZoomFactor(qreal);
+ Q_INVOKABLE bool heuristicZoom(int clickX, int clickY, qreal maxzoom);
int preferredWidth() const;
void setPreferredWidth(int);
- int webPageWidth() const;
- void setWebPageWidth(int);
+ int preferredHeight() const;
+ void setPreferredHeight(int);
enum Status { Null, Ready, Loading, Error };
Status status() const;
@@ -191,11 +192,10 @@ Q_SIGNALS:
void doubleClick(int clickX, int clickY);
- void zooming(qreal zoom, int centerX, int centerY);
+ void zoomTo(qreal zoom, int centerX, int centerY);
public Q_SLOTS:
QVariant evaluateJavaScript(const QString&);
- void heuristicZoom(int clickX, int clickY);
private Q_SLOTS:
void expandToWebPage();
diff --git a/tests/auto/declarative/.gitignore b/tests/auto/declarative/.gitignore
index c8bbd2f..d937eb4 100644
--- a/tests/auto/declarative/.gitignore
+++ b/tests/auto/declarative/.gitignore
@@ -1,3 +1,4 @@
tst_*
!tst_*.*
+tst_*.debug
tst_*~
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.ico b/tests/auto/declarative/qmlgraphicswebview/data/basic.ico
new file mode 100644
index 0000000..8f3d05e
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicswebview/data/basic.ico
Binary files differ
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/forward.html b/tests/auto/declarative/qmlgraphicswebview/data/forward.html
new file mode 100644
index 0000000..030446a
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicswebview/data/forward.html
@@ -0,0 +1,12 @@
+<html>
+<head><title>Forward</title>
+<link rel="icon" sizes="48x48" href="basic.png">
+</head>
+<body leftmargin="0" marginwidth="0">
+<table width="123">
+<tbody>
+<tr><td>This is more.</td></tr>
+</tbody>
+</table>
+</body>
+</html>
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html
new file mode 100644
index 0000000..35270bc
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.html
@@ -0,0 +1,11 @@
+<html>
+<head><title>JavaScript</title>
+<link rel="icon" sizes="48x48" href="basic.png">
+<script type="text/javascript">
+<!--
+window.onload = function(){ window.status = "status here"; }
+// -->
+</script>
+</head>
+<body>
+This is a JS test.
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml b/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml
new file mode 100644
index 0000000..1460f30
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicswebview/data/loadError.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+WebView {
+ url: "does-not-exist.html"
+}
diff --git a/tests/auto/declarative/visual/flickable/Day.qml b/tests/auto/declarative/visual/flickable/Day.qml
deleted file mode 100644
index 8416724..0000000
--- a/tests/auto/declarative/visual/flickable/Day.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-
-Rectangle {
- property string day
-
- width: 200
- height: 300
- radius: 7
- border.color: "black"
- id: Page
- Image {
- x: 10
- y: 10
- source: "cork.jpg"
- }
- Text {
- x: 20
- y: 20
- height: 40
- font.pixelSize: 14
- font.bold: true
- text: day
- style: "Outline"
- styleColor: "#dedede"
- }
-}
diff --git a/tests/auto/declarative/visual/flickable/cork.jpg b/tests/auto/declarative/visual/flickable/cork.jpg
deleted file mode 100644
index 6dc3a3f..0000000
--- a/tests/auto/declarative/visual/flickable/cork.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/visual/flickable/data-X11/flickable.0.png b/tests/auto/declarative/visual/flickable/data-X11/flickable.0.png
deleted file mode 100644
index 5da2f2a..0000000
--- a/tests/auto/declarative/visual/flickable/data-X11/flickable.0.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/visual/flickable/data-X11/flickable.1.png b/tests/auto/declarative/visual/flickable/data-X11/flickable.1.png
deleted file mode 100644
index 1c33ca6..0000000
--- a/tests/auto/declarative/visual/flickable/data-X11/flickable.1.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/visual/flickable/data-X11/flickable.2.png b/tests/auto/declarative/visual/flickable/data-X11/flickable.2.png
deleted file mode 100644
index 67cdf8f..0000000
--- a/tests/auto/declarative/visual/flickable/data-X11/flickable.2.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/visual/flickable/data-X11/flickable.qml b/tests/auto/declarative/visual/flickable/data-X11/flickable.qml
deleted file mode 100644
index 6a60409..0000000
--- a/tests/auto/declarative/visual/flickable/data-X11/flickable.qml
+++ /dev/null
@@ -1,791 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
- Frame {
- msec: 0
- }
- Frame {
- msec: 16
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 32
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 48
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 64
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 80
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 96
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 112
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 128
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 144
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 160
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 176
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 192
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 208
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 224
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 240
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 256
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 272
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 288
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 304
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 320
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 336
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 352
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 368
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 384
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 400
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 416
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 432
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 448
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 464
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 480
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 496
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 512
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 528
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 544
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 560
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 576
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 592
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 608
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 624
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 640
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 656
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 672
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 688
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 704
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Frame {
- msec: 720
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Mouse {
- type: 2
- button: 1
- buttons: 1
- x: 517; y: 154
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 736
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 514; y: 154
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 752
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 509; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 768
- hash: "2a07f4ab51ed6ac07c2efecfd561cdff"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 497; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 784
- hash: "4f30ebc802a38cd4ad05018b6bc429a4"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 480; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 800
- hash: "8d2e349b2aad07d98f11a30a33a5b409"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 443; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 816
- hash: "09647796906da54345fffa18eb1b1f91"
- }
- Mouse {
- type: 3
- button: 1
- buttons: 0
- x: 443; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 832
- hash: "09647796906da54345fffa18eb1b1f91"
- }
- Frame {
- msec: 848
- hash: "4a7dd2931129756437e38b3516474aa1"
- }
- Frame {
- msec: 864
- hash: "bbec3d9d7ca38599b03e44ed3c2b68b6"
- }
- Frame {
- msec: 880
- hash: "07214f888dba9ea84eae306cf92a0f7f"
- }
- Frame {
- msec: 896
- hash: "0feac7c874f8caf11db319c13ed2250e"
- }
- Frame {
- msec: 912
- hash: "7de76db129b4e9d17836d17fff687b99"
- }
- Frame {
- msec: 928
- hash: "7f3414d54148afd7b01ed0fe54b60ba2"
- }
- Frame {
- msec: 944
- hash: "692cde1197a0f37bee5a4e57160bff8b"
- }
- Frame {
- msec: 960
- image: "flickable.0.png"
- }
- Frame {
- msec: 976
- hash: "d0b879cb63d003c0fd00c14160e7d1a4"
- }
- Frame {
- msec: 992
- hash: "9a0879e4e9b23ad3c9340d7c28eb6386"
- }
- Frame {
- msec: 1008
- hash: "2b6f4cb48284a835f77bc6368566c187"
- }
- Frame {
- msec: 1024
- hash: "53c094e3aa4f841195b2ce4e0fa34fae"
- }
- Frame {
- msec: 1040
- hash: "3ef7530199a136d339adf677cf98f035"
- }
- Frame {
- msec: 1056
- hash: "1a707788b43773ffa05d0ad88e6f156d"
- }
- Frame {
- msec: 1072
- hash: "e51dc6702e59c68e6a34f4a8f6c5b5c5"
- }
- Frame {
- msec: 1088
- hash: "1fe6d9b517ad1b9aaf16d005577ab45d"
- }
- Frame {
- msec: 1104
- hash: "fac02bdb63d4aa7749a66f6aa91a7035"
- }
- Frame {
- msec: 1120
- hash: "4bad8d93cee30c76a4b263981adc0c2f"
- }
- Frame {
- msec: 1136
- hash: "8bcee1ab8a1ab66b22d59d975a265906"
- }
- Frame {
- msec: 1152
- hash: "a68fa84e32d4ba44d4d53b476505ff6e"
- }
- Frame {
- msec: 1168
- hash: "d7258071d6673ef22a8836a8fdc6c5a6"
- }
- Frame {
- msec: 1184
- hash: "c708f62342663a4a879c86cd97448b75"
- }
- Frame {
- msec: 1200
- hash: "2e28d213283f4791d051177f468d9246"
- }
- Frame {
- msec: 1216
- hash: "beb36da1d54eedc62b65c47ba7c43f59"
- }
- Frame {
- msec: 1232
- hash: "2cea7b5571c563a709e211fbb5684a9d"
- }
- Frame {
- msec: 1248
- hash: "9ef0bafe8a9d52bc2fb7732c02ea9304"
- }
- Frame {
- msec: 1264
- hash: "7a489611578c9590aaf1b85763d8ae2c"
- }
- Frame {
- msec: 1280
- hash: "31b8e33b788821922d6d437f40c7811c"
- }
- Frame {
- msec: 1296
- hash: "421ae01b4d757996aefb35641f167c2d"
- }
- Frame {
- msec: 1312
- hash: "175c93fde4cb520881802a57bf10be5f"
- }
- Frame {
- msec: 1328
- hash: "11602a6ca746c83c857524eafc4d9570"
- }
- Frame {
- msec: 1344
- hash: "4f10b74a1bb8d65f3d371cc613a1641a"
- }
- Frame {
- msec: 1360
- hash: "d8505ce7ad73683817ed4e3a7f3ab610"
- }
- Frame {
- msec: 1376
- hash: "a800684370e06817e1a2a34ceb2fc651"
- }
- Frame {
- msec: 1392
- hash: "267e184af16c63eefe290c6659917b34"
- }
- Frame {
- msec: 1408
- hash: "354c5b04c0ed2288c23064debb4e261e"
- }
- Frame {
- msec: 1424
- hash: "67d300a0f15f0642c4ba0c8bd7662c01"
- }
- Frame {
- msec: 1440
- hash: "2fe12d1625140c2da1f0af17e1bf548b"
- }
- Frame {
- msec: 1456
- hash: "fef2140a272d78f5c0e93ec3a4c6e6c9"
- }
- Frame {
- msec: 1472
- hash: "b9331a586bad1619e51794bc66bf36fc"
- }
- Frame {
- msec: 1488
- hash: "8ba04c015ca8c150e0bbb09769955b5d"
- }
- Frame {
- msec: 1504
- hash: "09f573e1465533e67fa0d504e5481c8b"
- }
- Frame {
- msec: 1520
- hash: "fe3e919aa08ddd51ee7b81ef405b10f4"
- }
- Frame {
- msec: 1536
- hash: "e5d85427a2e02dd83d2932205e7aa6ac"
- }
- Frame {
- msec: 1552
- hash: "4e97fda26cbb0273dd69e50cf134a147"
- }
- Frame {
- msec: 1568
- hash: "7e13b494b5397b747eb6065f7555acce"
- }
- Frame {
- msec: 1584
- hash: "fe9567c08f776bed903a74c9c21a18bb"
- }
- Frame {
- msec: 1600
- hash: "086dd974228d51513e732c96c69dd07f"
- }
- Frame {
- msec: 1616
- hash: "b43d5b4f44df55b1099c7ba339df1799"
- }
- Frame {
- msec: 1632
- hash: "ce0e82fc42ff0017b40278e323682348"
- }
- Frame {
- msec: 1648
- hash: "e28b9cee2047774d70df6510c83e9dfe"
- }
- Frame {
- msec: 1664
- hash: "568d97ff98ac2d867981eb7330b831b1"
- }
- Frame {
- msec: 1680
- hash: "10f38a5f95a91bc7380a13f5aa30f22f"
- }
- Frame {
- msec: 1696
- hash: "2f9ec9b1843f2970fa8225f313781404"
- }
- Frame {
- msec: 1712
- hash: "bdd8405a889ff9a6e33cce65416bdc43"
- }
- Frame {
- msec: 1728
- hash: "9f57f8460ade9e6ff3db7a0a8d044f07"
- }
- Frame {
- msec: 1744
- hash: "36d1e95a006c00b183b24a05c2acf12f"
- }
- Frame {
- msec: 1760
- hash: "78d7f8b056c0341b442c0eabbf6da90b"
- }
- Frame {
- msec: 1776
- hash: "f5786d9a77a28796908fcb376af2cc1f"
- }
- Frame {
- msec: 1792
- hash: "38cfaf7a356163f8ff9708ba625907b7"
- }
- Frame {
- msec: 1808
- hash: "989922a8c5e3c000811a994bfe183d7f"
- }
- Frame {
- msec: 1824
- hash: "989922a8c5e3c000811a994bfe183d7f"
- }
- Frame {
- msec: 1840
- hash: "989922a8c5e3c000811a994bfe183d7f"
- }
- Frame {
- msec: 1856
- hash: "f5786d9a77a28796908fcb376af2cc1f"
- }
- Frame {
- msec: 1872
- hash: "014cfc6573eb0a89acacd6f154098202"
- }
- Frame {
- msec: 1888
- hash: "247fead2e4139421cb6e5f7a97fa1768"
- }
- Frame {
- msec: 1904
- hash: "bdd8405a889ff9a6e33cce65416bdc43"
- }
- Frame {
- msec: 1920
- image: "flickable.1.png"
- }
- Frame {
- msec: 1936
- hash: "d64f65edf900912158634c88b5c0b5ca"
- }
- Frame {
- msec: 1952
- hash: "d714183774f603269335b0675e0656f8"
- }
- Frame {
- msec: 1968
- hash: "24f9e90f7789a7c5db65d59312d49fe1"
- }
- Frame {
- msec: 1984
- hash: "ce0e82fc42ff0017b40278e323682348"
- }
- Frame {
- msec: 2000
- hash: "f564293ff63ccc952597ac228c6437dc"
- }
- Frame {
- msec: 2016
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2032
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2048
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2064
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2080
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2096
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2112
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2128
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2144
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2160
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2176
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2192
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2208
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2224
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2240
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2256
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2272
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2288
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2304
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2320
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2336
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2352
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2368
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2384
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2400
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2416
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2432
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2448
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2464
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2480
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2496
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2512
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2528
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2544
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2560
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2576
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2592
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2608
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2624
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2640
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2656
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2672
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2688
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2704
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2720
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2736
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2752
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2768
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2784
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2800
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2816
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Key {
- type: 6
- key: 16777249
- modifiers: 0
- text: ""
- autorep: false
- count: 1
- }
- Frame {
- msec: 2832
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2848
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2864
- hash: "555d97eac7e8b06cb81f4af74098ce65"
- }
- Frame {
- msec: 2880
- image: "flickable.2.png"
- }
-}
diff --git a/tests/auto/declarative/visual/flickable/data/flickable.0.png b/tests/auto/declarative/visual/flickable/data/flickable.0.png
deleted file mode 100644
index b7ddf5a..0000000
--- a/tests/auto/declarative/visual/flickable/data/flickable.0.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/visual/flickable/data/flickable.1.png b/tests/auto/declarative/visual/flickable/data/flickable.1.png
deleted file mode 100644
index ef48b85..0000000
--- a/tests/auto/declarative/visual/flickable/data/flickable.1.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/visual/flickable/data/flickable.2.png b/tests/auto/declarative/visual/flickable/data/flickable.2.png
deleted file mode 100644
index 60c357b..0000000
--- a/tests/auto/declarative/visual/flickable/data/flickable.2.png
+++ /dev/null
Binary files differ
diff --git a/tests/auto/declarative/visual/flickable/data/flickable.qml b/tests/auto/declarative/visual/flickable/data/flickable.qml
deleted file mode 100644
index 730c128..0000000
--- a/tests/auto/declarative/visual/flickable/data/flickable.qml
+++ /dev/null
@@ -1,791 +0,0 @@
-import Qt.VisualTest 4.6
-
-VisualTest {
- Frame {
- msec: 0
- }
- Frame {
- msec: 16
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 32
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 48
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 64
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 80
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 96
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 112
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 128
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 144
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 160
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 176
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 192
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 208
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 224
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 240
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 256
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 272
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 288
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 304
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 320
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 336
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 352
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 368
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 384
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 400
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 416
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 432
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 448
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 464
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 480
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 496
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 512
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 528
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 544
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 560
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 576
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 592
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 608
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 624
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 640
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 656
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 672
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 688
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 704
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Frame {
- msec: 720
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Mouse {
- type: 2
- button: 1
- buttons: 1
- x: 517; y: 154
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 736
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 514; y: 154
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 752
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 509; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 768
- hash: "eceae327c367ccc69c5133d027df77c2"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 497; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 784
- hash: "6a0f0d49abe4b5c2f3347bb0912c46bd"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 480; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 800
- hash: "c7c13b23ac20eaee2a0fca45a03495d3"
- }
- Mouse {
- type: 5
- button: 1
- buttons: 1
- x: 443; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 816
- hash: "50559226ce0e0d94d330f34b0dfdaf48"
- }
- Mouse {
- type: 3
- button: 1
- buttons: 0
- x: 443; y: 155
- modifiers: 0
- sendToViewport: true
- }
- Frame {
- msec: 832
- hash: "50559226ce0e0d94d330f34b0dfdaf48"
- }
- Frame {
- msec: 848
- hash: "dda302c698e909c7bf4cffdedf68fffb"
- }
- Frame {
- msec: 864
- hash: "d2ef86c4e840e22f27b9d5806d2685c1"
- }
- Frame {
- msec: 880
- hash: "6a38ab0c8e4e6687b1922d1ab30c5193"
- }
- Frame {
- msec: 896
- hash: "ddec5e9353017ae5d12f3efb9a15327c"
- }
- Frame {
- msec: 912
- hash: "e383591b6ce172ef86e2f1a90c5988db"
- }
- Frame {
- msec: 928
- hash: "3cd848d258775f50cbb668490b7cebf6"
- }
- Frame {
- msec: 944
- hash: "348f9bb0282edbe99947e72f234c0c72"
- }
- Frame {
- msec: 960
- image: "flickable.0.png"
- }
- Frame {
- msec: 976
- hash: "f7744a4f78b6791ce5f5184834f1798e"
- }
- Frame {
- msec: 992
- hash: "c4014a38bf59218e0673519c5bab0f74"
- }
- Frame {
- msec: 1008
- hash: "2a6b3d050b0f854b8f71d77b58dd9d8f"
- }
- Frame {
- msec: 1024
- hash: "30f25f6dcbad9e495d869943a8d83eee"
- }
- Frame {
- msec: 1040
- hash: "b5d6d395c94a19e9776ff1162c64993f"
- }
- Frame {
- msec: 1056
- hash: "2ce75b60f41f4b6b0c421788effd4be8"
- }
- Frame {
- msec: 1072
- hash: "cda31ad2f65d7d6cc1c9974748243904"
- }
- Frame {
- msec: 1088
- hash: "ffa1e5a479e60304570d89465e8898b1"
- }
- Frame {
- msec: 1104
- hash: "d8c984c1e00056cdfd1814f96fc04125"
- }
- Frame {
- msec: 1120
- hash: "0e855b0616b1c837c22ea34bbff76f10"
- }
- Frame {
- msec: 1136
- hash: "d2189d6dc8f635f9df5889e6825d11fc"
- }
- Frame {
- msec: 1152
- hash: "4086f2213831f0c616e7e02f58b17c46"
- }
- Frame {
- msec: 1168
- hash: "40b216eb2b7a0025123fa2374215644a"
- }
- Frame {
- msec: 1184
- hash: "236edf2f7da209cb5bf3efe334977e7f"
- }
- Frame {
- msec: 1200
- hash: "c2a9242b261988b58e58dc764aac7fca"
- }
- Frame {
- msec: 1216
- hash: "a6b707c16d0b72552403a518a27e40c8"
- }
- Frame {
- msec: 1232
- hash: "e0800659c30618417c56e5a8b6de0eeb"
- }
- Frame {
- msec: 1248
- hash: "3006d6af221e50eef60f67cc32d45e30"
- }
- Frame {
- msec: 1264
- hash: "7deab264af55709f25d22a10a83f2595"
- }
- Frame {
- msec: 1280
- hash: "11e2c733f48c02e8b1c66c0e9cc7f4b0"
- }
- Frame {
- msec: 1296
- hash: "a1242c3ea085838371fa1f31e11b4cc4"
- }
- Frame {
- msec: 1312
- hash: "3cba18358c3db55a585095733a914b31"
- }
- Frame {
- msec: 1328
- hash: "45dde70b0436f365f1711005321fbc1a"
- }
- Frame {
- msec: 1344
- hash: "29a9c57bb78c41e89d5db19b54a4f760"
- }
- Frame {
- msec: 1360
- hash: "3ec8e579f2ee49da0bf384f4b688e70e"
- }
- Frame {
- msec: 1376
- hash: "e6b7d3147b213ed2cddc81ee784b275b"
- }
- Frame {
- msec: 1392
- hash: "77a82e5d657b32b6f7f1681139c83b83"
- }
- Frame {
- msec: 1408
- hash: "623bcf513f95f6ca3052dc6f1fb13fb5"
- }
- Frame {
- msec: 1424
- hash: "d10b5fac984040899790273cd9246f71"
- }
- Frame {
- msec: 1440
- hash: "7b48417ae3627fed645b804ea24b376a"
- }
- Frame {
- msec: 1456
- hash: "5e5eb1fdc7fdf34f3df46b187544b9d5"
- }
- Frame {
- msec: 1472
- hash: "e4f08871f3dcb355c267fc27654c5704"
- }
- Frame {
- msec: 1488
- hash: "e8d82fee9fb5b2bb2fd6149a12947ea6"
- }
- Frame {
- msec: 1504
- hash: "a54e845480bed6b16c120a59a2bb07c3"
- }
- Frame {
- msec: 1520
- hash: "a96ae1a5ca2d04d7b330c4e1d5e2594a"
- }
- Frame {
- msec: 1536
- hash: "d1a4c4b1864581bad005392dd3c54d8a"
- }
- Frame {
- msec: 1552
- hash: "5bd3ae538de83151f90a40c800c081a5"
- }
- Frame {
- msec: 1568
- hash: "be5adfb11a6ad52d432fb96c0526d2ee"
- }
- Frame {
- msec: 1584
- hash: "2ea08dda212fa9839e0183d2b742c64f"
- }
- Frame {
- msec: 1600
- hash: "ba0d9014b7e30a49c51196807809368b"
- }
- Frame {
- msec: 1616
- hash: "e6cfdc4688cc7e49842a58bc39a6a1b3"
- }
- Frame {
- msec: 1632
- hash: "3aca4ba1d6bd38cdc278ff5d19e37693"
- }
- Frame {
- msec: 1648
- hash: "41acb4e8cddfa8371446bef580d420b4"
- }
- Frame {
- msec: 1664
- hash: "4860e0bf80bfd01b9e7e1d3b11152ac4"
- }
- Frame {
- msec: 1680
- hash: "85806f7e41725a35cb20b3ca07a2b3be"
- }
- Frame {
- msec: 1696
- hash: "07a0af6f784b91838d1ed23c326c29ce"
- }
- Frame {
- msec: 1712
- hash: "d4d0c0e65861dbce8992d714f5b18f0b"
- }
- Frame {
- msec: 1728
- hash: "ebcc280d376fed1bb45588992ad777e3"
- }
- Frame {
- msec: 1744
- hash: "2d8c183189c0a9234d6ff1e663503853"
- }
- Frame {
- msec: 1760
- hash: "5e3bec7de667175a7bd89aa5eb704003"
- }
- Frame {
- msec: 1776
- hash: "709b890b1939261377537f7bddb45a60"
- }
- Frame {
- msec: 1792
- hash: "c95dfd0259048e27a98b4676957e5183"
- }
- Frame {
- msec: 1808
- hash: "bfff5f9e90e280a3684f46967e8cb73f"
- }
- Frame {
- msec: 1824
- hash: "bfff5f9e90e280a3684f46967e8cb73f"
- }
- Frame {
- msec: 1840
- hash: "bfff5f9e90e280a3684f46967e8cb73f"
- }
- Frame {
- msec: 1856
- hash: "709b890b1939261377537f7bddb45a60"
- }
- Frame {
- msec: 1872
- hash: "a7ca5f1053393486cf48d5a83d89d1a7"
- }
- Frame {
- msec: 1888
- hash: "d9c34a6fe59ed8f9ff7b792301f80f52"
- }
- Frame {
- msec: 1904
- hash: "d4d0c0e65861dbce8992d714f5b18f0b"
- }
- Frame {
- msec: 1920
- image: "flickable.1.png"
- }
- Frame {
- msec: 1936
- hash: "cc7228edac6583cab5b186cd9bbb2233"
- }
- Frame {
- msec: 1952
- hash: "6a6af6de32f68f85c902140bc40071d3"
- }
- Frame {
- msec: 1968
- hash: "43b6b548eb145f79fa655c270abaac32"
- }
- Frame {
- msec: 1984
- hash: "3aca4ba1d6bd38cdc278ff5d19e37693"
- }
- Frame {
- msec: 2000
- hash: "184e42b2bcc0e5cf354dc92acdc23cef"
- }
- Frame {
- msec: 2016
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2032
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2048
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2064
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2080
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2096
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2112
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2128
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2144
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2160
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2176
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2192
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2208
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2224
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2240
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2256
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2272
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2288
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2304
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2320
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2336
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2352
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2368
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2384
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2400
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2416
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2432
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2448
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2464
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2480
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2496
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2512
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2528
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2544
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2560
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2576
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2592
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2608
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2624
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2640
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2656
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2672
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2688
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2704
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2720
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2736
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2752
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2768
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2784
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2800
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2816
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Key {
- type: 6
- key: 16777249
- modifiers: 67108864
- text: ""
- autorep: false
- count: 1
- }
- Frame {
- msec: 2832
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2848
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2864
- hash: "ca3d2b3643a5c682253a5f6d9a4d7bc6"
- }
- Frame {
- msec: 2880
- image: "flickable.2.png"
- }
-}
diff --git a/tests/auto/declarative/visual/flickable/flickable.qml b/tests/auto/declarative/visual/flickable/flickable.qml
deleted file mode 100644
index 42bd5b3..0000000
--- a/tests/auto/declarative/visual/flickable/flickable.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-import Qt 4.6
-
-Rectangle {
- color: "lightSteelBlue"
- width: 600
- height: 300
- ListModel {
- id: List
- ListElement {
- name: "Sunday"
- dayColor: "#808080"
- }
- ListElement {
- name: "Monday"
- dayColor: "blue"
- }
- ListElement {
- name: "Tuesday"
- dayColor: "yellow"
- }
- ListElement {
- name: "Wednesday"
- dayColor: "purple"
- }
- ListElement {
- name: "Thursday"
- dayColor: "blue"
- }
- ListElement {
- name: "Friday"
- dayColor: "green"
- }
- ListElement {
- name: "Saturday"
- dayColor: "orange"
- }
- }
- Flickable {
- id: Flick
- anchors.fill: parent
- viewportWidth: Lay.width
- Row {
- id: Lay
- Repeater {
- model: List
- Component {
- Day {
- day: name
- color: dayColor
- }
- }
- }
- }
- }
-}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.png
new file mode 100644
index 0000000..1aa4118
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.0.png
Binary files differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.png
new file mode 100644
index 0000000..d4a1033
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.1.png
Binary files differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.png
new file mode 100644
index 0000000..39cb15d
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.2.png
Binary files differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.png
new file mode 100644
index 0000000..1aa4118
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.3.png
Binary files differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml
new file mode 100644
index 0000000..164ade9
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-horizontal.qml
@@ -0,0 +1,1199 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+ Frame {
+ msec: 0
+ }
+ Frame {
+ msec: 16
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 32
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 48
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 64
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 80
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 96
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 112
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 128
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 144
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 160
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 176
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 192
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 208
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 224
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 240
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 256
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 272
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 288
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 304
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 320
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 336
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 352
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 368
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 384
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 400
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 416
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 432
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 448
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 464
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 480
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 496
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 512
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 528
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 544
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 560
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 576
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 592
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 608
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 624
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 640
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 656
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 672
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 688
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 704
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 720
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 736
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 752
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 768
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 784
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 800
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 816
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 832
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 848
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 864
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 880
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 896
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 912
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 928
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 944
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Mouse {
+ type: 2
+ button: 1
+ buttons: 1
+ x: 477; y: 171
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 960
+ image: "flickable-horizontal.0.png"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 473; y: 171
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 976
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 463; y: 171
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 992
+ hash: "977f0b0f5a1496870fc23b03c8ae1bc1"
+ }
+ Frame {
+ msec: 1008
+ hash: "977f0b0f5a1496870fc23b03c8ae1bc1"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 449; y: 171
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 1024
+ hash: "44e907a136dad33b8324baee24d8738f"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 425; y: 172
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 1040
+ hash: "1749a8ef0298bfa6209969275b03d656"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 393; y: 172
+ modifiers: 0
+ sendToViewport: true
+ }
+ Mouse {
+ type: 3
+ button: 1
+ buttons: 0
+ x: 393; y: 172
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 1056
+ hash: "f4f5b1530cf0b325a4a1600b28e84ebc"
+ }
+ Frame {
+ msec: 1072
+ hash: "95a072a5abb8c50ab3f796aa82610686"
+ }
+ Frame {
+ msec: 1088
+ hash: "12b7eeeb356ecf347dd3484a15a9d5e1"
+ }
+ Frame {
+ msec: 1104
+ hash: "f4b09cc69a92f9d63766162f9f3e50ee"
+ }
+ Frame {
+ msec: 1120
+ hash: "44bbb2226c3f5226df34a4014528d566"
+ }
+ Frame {
+ msec: 1136
+ hash: "004f80d0307b9ffa9c4fed0eb8ea132e"
+ }
+ Frame {
+ msec: 1152
+ hash: "26dbaf102b7cce6504891ee593335dc2"
+ }
+ Frame {
+ msec: 1168
+ hash: "5bf148e84c49e7c9d57d22d6b78a97f2"
+ }
+ Frame {
+ msec: 1184
+ hash: "a65e2fb6cdb4209b09a75a88c28219ff"
+ }
+ Frame {
+ msec: 1200
+ hash: "a5717b018032b16ca2e2d7d6176b7b4f"
+ }
+ Frame {
+ msec: 1216
+ hash: "1863bee07e7d0af16350eca29c30680e"
+ }
+ Frame {
+ msec: 1232
+ hash: "b990be702197081ec305f2ee574335ad"
+ }
+ Frame {
+ msec: 1248
+ hash: "c68e718db51fbf7bdcb06d7f8b791050"
+ }
+ Frame {
+ msec: 1264
+ hash: "f54cc959e032d4d278abf23a20e8a9bf"
+ }
+ Frame {
+ msec: 1280
+ hash: "784e68b1cd9c005073b328e9a4370bc4"
+ }
+ Frame {
+ msec: 1296
+ hash: "a5cbc7f46cc8e3341fe1990d2ad85cb5"
+ }
+ Frame {
+ msec: 1312
+ hash: "cdaea6f8392a9a585939d0693e7dfdb4"
+ }
+ Frame {
+ msec: 1328
+ hash: "7c55c32cf28b7220ae5cb62a978cbf8b"
+ }
+ Frame {
+ msec: 1344
+ hash: "73d6da0f6f5e9d9208c1a4298b12a927"
+ }
+ Frame {
+ msec: 1360
+ hash: "a39afd2aa0354768298ec07706f58b0b"
+ }
+ Frame {
+ msec: 1376
+ hash: "2ab85582bb135624cb28db1014aa53e7"
+ }
+ Frame {
+ msec: 1392
+ hash: "a5efd47689c2afe86e8ac8b9c5b9f0cb"
+ }
+ Frame {
+ msec: 1408
+ hash: "ece4a8908b46d17a40442c345f3cfd35"
+ }
+ Frame {
+ msec: 1424
+ hash: "59bea64b5afc088b4574dc2d05781410"
+ }
+ Frame {
+ msec: 1440
+ hash: "d40b0ba1fe765c78a0508f156206ed24"
+ }
+ Frame {
+ msec: 1456
+ hash: "453563ccf786a1fad9eb7bcc82bc1837"
+ }
+ Frame {
+ msec: 1472
+ hash: "ff8ab23c6e93d997495cd27b59a8b37a"
+ }
+ Frame {
+ msec: 1488
+ hash: "eeb2f27400bcd3d8e56b08a22f808e0e"
+ }
+ Frame {
+ msec: 1504
+ hash: "ad44e927b4501c5ff4dac6715687eaa0"
+ }
+ Frame {
+ msec: 1520
+ hash: "12f82b67503ff0817de2eb1286a1af0f"
+ }
+ Frame {
+ msec: 1536
+ hash: "a53c71405ef22f78d389a2865efdbf37"
+ }
+ Frame {
+ msec: 1552
+ hash: "d00f09eb4e31bc2b58650ddc23b006de"
+ }
+ Frame {
+ msec: 1568
+ hash: "7fc5a3a78bc5a08321e5520b08b83fee"
+ }
+ Frame {
+ msec: 1584
+ hash: "635515ec1d85b3103e2348249e090f33"
+ }
+ Frame {
+ msec: 1600
+ hash: "8313dbdabaffda563264883eebb26e84"
+ }
+ Frame {
+ msec: 1616
+ hash: "e692758ee1d51cb9bbc2056d0d97b28e"
+ }
+ Frame {
+ msec: 1632
+ hash: "52b32f8591c40fb385f5a2ff85c6ddce"
+ }
+ Frame {
+ msec: 1648
+ hash: "85b9e88281c51b8f34861e1148d82aa2"
+ }
+ Frame {
+ msec: 1664
+ hash: "d88adae40850ab799783eaa198927ae8"
+ }
+ Frame {
+ msec: 1680
+ hash: "da02cc9a7dc19f5285d07a53a9e71010"
+ }
+ Frame {
+ msec: 1696
+ hash: "6f918e1110d7a9e44588f6cadb72d496"
+ }
+ Frame {
+ msec: 1712
+ hash: "fac57187bb9397af570403f3f304aefd"
+ }
+ Frame {
+ msec: 1728
+ hash: "a791e2251a6ac16d3eca1a13fe6ad688"
+ }
+ Frame {
+ msec: 1744
+ hash: "444c360ed83a967e38e42644f87cb048"
+ }
+ Frame {
+ msec: 1760
+ hash: "088c7622dcb96bd3a0770bedf3b91ce3"
+ }
+ Frame {
+ msec: 1776
+ hash: "6c90b37eae7641f7bc327f92783b3480"
+ }
+ Frame {
+ msec: 1792
+ hash: "274d7824fc290644ff1d86a76c65f86b"
+ }
+ Frame {
+ msec: 1808
+ hash: "26b1251d048b752fdd6412bd05e4ebb4"
+ }
+ Frame {
+ msec: 1824
+ hash: "260336803008cd9fc18b8793c6e7ff45"
+ }
+ Frame {
+ msec: 1840
+ hash: "7c3f37385ab47b37bf370c2c9a885b6b"
+ }
+ Frame {
+ msec: 1856
+ hash: "d4f49a6540a51489529f2b5ef8fc1749"
+ }
+ Frame {
+ msec: 1872
+ hash: "64889c9b02ef00d01393499dc13b07e6"
+ }
+ Frame {
+ msec: 1888
+ hash: "88746e0d897de3f24c455cf0b79ec53d"
+ }
+ Frame {
+ msec: 1904
+ hash: "94c3e0c330a80873ead8b98d2988de6c"
+ }
+ Frame {
+ msec: 1920
+ image: "flickable-horizontal.1.png"
+ }
+ Frame {
+ msec: 1936
+ hash: "b792022e5ffc6c6442024732e21b3970"
+ }
+ Frame {
+ msec: 1952
+ hash: "b14cded381a30c7af9a9d26c975b82ce"
+ }
+ Frame {
+ msec: 1968
+ hash: "a93beb1a8220c941c164933a5a3195b6"
+ }
+ Frame {
+ msec: 1984
+ hash: "2be13d8356a4c71f3933cac242d1ef48"
+ }
+ Frame {
+ msec: 2000
+ hash: "0cc0afa2e4a6144dfb35e43e2ed56e41"
+ }
+ Frame {
+ msec: 2016
+ hash: "ff02d304cb59e5e35590c25f352aeaba"
+ }
+ Frame {
+ msec: 2032
+ hash: "d27412f80810102d9955106f54899001"
+ }
+ Frame {
+ msec: 2048
+ hash: "73fc0ef258b3812aa898c0027ab63d3b"
+ }
+ Frame {
+ msec: 2064
+ hash: "73fc0ef258b3812aa898c0027ab63d3b"
+ }
+ Frame {
+ msec: 2080
+ hash: "73fc0ef258b3812aa898c0027ab63d3b"
+ }
+ Frame {
+ msec: 2096
+ hash: "73fc0ef258b3812aa898c0027ab63d3b"
+ }
+ Frame {
+ msec: 2112
+ hash: "9cfbf1d60a312090ffad9d4844e1cde3"
+ }
+ Frame {
+ msec: 2128
+ hash: "d27412f80810102d9955106f54899001"
+ }
+ Frame {
+ msec: 2144
+ hash: "0cc0afa2e4a6144dfb35e43e2ed56e41"
+ }
+ Frame {
+ msec: 2160
+ hash: "9c43502f88d57b79a56b1e5b72556da8"
+ }
+ Frame {
+ msec: 2176
+ hash: "b14cded381a30c7af9a9d26c975b82ce"
+ }
+ Frame {
+ msec: 2192
+ hash: "d6176543b445ec185214a5d160846360"
+ }
+ Frame {
+ msec: 2208
+ hash: "922284f2073ceb0a3ffbd699b75fec4a"
+ }
+ Frame {
+ msec: 2224
+ hash: "e28e2b3831c7c0a05722deeefe0e75ca"
+ }
+ Frame {
+ msec: 2240
+ hash: "6c59cd907fefec85e5e2a53ace6728d2"
+ }
+ Frame {
+ msec: 2256
+ hash: "ce64653d01d924313a95c7dc62189c7a"
+ }
+ Frame {
+ msec: 2272
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2288
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2304
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2320
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2336
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2352
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2368
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2384
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2400
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2416
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2432
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2448
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2464
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2480
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2496
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2512
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2528
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2544
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2560
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2576
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2592
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2608
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2624
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2640
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2656
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2672
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2688
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2704
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2720
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2736
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2752
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2768
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Mouse {
+ type: 2
+ button: 1
+ buttons: 1
+ x: 152; y: 189
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2784
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2800
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Frame {
+ msec: 2816
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 154; y: 190
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2832
+ hash: "c1c9421390ffab13b7529df32ff12cda"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 169; y: 191
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2848
+ hash: "d0b5d17cfdb80953f1708c7afaf8d647"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 202; y: 192
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2864
+ hash: "a06edc3b827b43890b31c43c94528418"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 256; y: 192
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2880
+ image: "flickable-horizontal.2.png"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 331; y: 192
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2896
+ hash: "e3b769cc98dd14050b61124d60729416"
+ }
+ Frame {
+ msec: 2912
+ hash: "e3b769cc98dd14050b61124d60729416"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 395; y: 194
+ modifiers: 0
+ sendToViewport: true
+ }
+ Mouse {
+ type: 3
+ button: 1
+ buttons: 0
+ x: 395; y: 194
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2928
+ hash: "128c43127815ee61d4e04b5447b4ebdd"
+ }
+ Frame {
+ msec: 2944
+ hash: "272059ad4598cae7bfa5e333411907c8"
+ }
+ Frame {
+ msec: 2960
+ hash: "313a41ad178f774b3f31310c36b96384"
+ }
+ Frame {
+ msec: 2976
+ hash: "8c2a43fee7b63ebc8157ffc1e5fcb960"
+ }
+ Frame {
+ msec: 2992
+ hash: "51498fb98bd4a8d44cca097a99ede331"
+ }
+ Frame {
+ msec: 3008
+ hash: "af6ca69bf74d46a942586a108828ce2a"
+ }
+ Frame {
+ msec: 3024
+ hash: "854ae6e29c44a8c48e112cb5195770c9"
+ }
+ Frame {
+ msec: 3040
+ hash: "553b7344dea684a54cf0dbe724af2e8b"
+ }
+ Frame {
+ msec: 3056
+ hash: "d529d4abed74766722c6b8c79c92deb7"
+ }
+ Frame {
+ msec: 3072
+ hash: "a142d88b935c51edf8bff7cb76f2682e"
+ }
+ Frame {
+ msec: 3088
+ hash: "f99b784f9d383bb9d79ff52614a1c388"
+ }
+ Frame {
+ msec: 3104
+ hash: "be2824b6e02a05e964077773e7ae9c3b"
+ }
+ Frame {
+ msec: 3120
+ hash: "8eb67b4b413817414a003cdc2f1f86bb"
+ }
+ Frame {
+ msec: 3136
+ hash: "73c7d57bb7a201402b4ff9becd3c82a6"
+ }
+ Frame {
+ msec: 3152
+ hash: "ddfa1aeef7e4c067455ae4e6ae18cc71"
+ }
+ Frame {
+ msec: 3168
+ hash: "f4f5b1530cf0b325a4a1600b28e84ebc"
+ }
+ Frame {
+ msec: 3184
+ hash: "60da5fb0439cb20905fb20ee1c31680e"
+ }
+ Frame {
+ msec: 3200
+ hash: "049df3603a3e99a22a35534333da743d"
+ }
+ Frame {
+ msec: 3216
+ hash: "daa9754519ce6df8e0836dba7207bb34"
+ }
+ Frame {
+ msec: 3232
+ hash: "3b636346c08a9d7fadb96faa477e4ed1"
+ }
+ Frame {
+ msec: 3248
+ hash: "54509abac3bce1333ebce926938ae3a3"
+ }
+ Frame {
+ msec: 3264
+ hash: "8723907d2d9c7f6abd5b0a2972dd0206"
+ }
+ Frame {
+ msec: 3280
+ hash: "98bde35a77a706019e89d999125db7b8"
+ }
+ Frame {
+ msec: 3296
+ hash: "086a66572ed7b9a1b6ba765617273ffa"
+ }
+ Frame {
+ msec: 3312
+ hash: "87bff32df027aff1c5a23bab6f988205"
+ }
+ Frame {
+ msec: 3328
+ hash: "140effcb29db05cf99b4b9aa875294f4"
+ }
+ Frame {
+ msec: 3344
+ hash: "a1eecff3b60daecfa1f1639f53f1a6e6"
+ }
+ Frame {
+ msec: 3360
+ hash: "a1eecff3b60daecfa1f1639f53f1a6e6"
+ }
+ Frame {
+ msec: 3376
+ hash: "a1eecff3b60daecfa1f1639f53f1a6e6"
+ }
+ Frame {
+ msec: 3392
+ hash: "790e32368985a3320b37185204f6abdf"
+ }
+ Frame {
+ msec: 3408
+ hash: "c6550cb01cee0ebc36163e02732b47f2"
+ }
+ Frame {
+ msec: 3424
+ hash: "87bff32df027aff1c5a23bab6f988205"
+ }
+ Frame {
+ msec: 3440
+ hash: "79507b20a8f235b126e18cbe6ef72f50"
+ }
+ Frame {
+ msec: 3456
+ hash: "b2374960c6e77d626f5b0ad1ae3cbb45"
+ }
+ Frame {
+ msec: 3472
+ hash: "9bca6e81315436eeedad0f7f491e04a3"
+ }
+ Frame {
+ msec: 3488
+ hash: "374c81cf58b1be36069bb35799e92e88"
+ }
+ Frame {
+ msec: 3504
+ hash: "ad1f31e7547694e125d61e44ef549cbc"
+ }
+ Frame {
+ msec: 3520
+ hash: "abd5c21a69af3ab47ca4cdbbff322207"
+ }
+ Frame {
+ msec: 3536
+ hash: "54174b29f97ad782bb033e2cc7d5422b"
+ }
+ Frame {
+ msec: 3552
+ hash: "54174b29f97ad782bb033e2cc7d5422b"
+ }
+ Frame {
+ msec: 3568
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3584
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3600
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3616
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3632
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3648
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3664
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3680
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3696
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3712
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3728
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3744
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3760
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3776
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3792
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3808
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3824
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3840
+ image: "flickable-horizontal.3.png"
+ }
+ Frame {
+ msec: 3856
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3872
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3888
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3904
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3920
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3936
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3952
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3968
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 3984
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4000
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4016
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4032
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4048
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4064
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4080
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4096
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4112
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4128
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4144
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4160
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Key {
+ type: 6
+ key: 16777249
+ modifiers: 67108864
+ text: ""
+ autorep: false
+ count: 1
+ }
+ Frame {
+ msec: 4176
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4192
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4208
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4224
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4240
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+ Frame {
+ msec: 4256
+ hash: "b9d6ace089c7bdce8fad4143e2068d19"
+ }
+}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.png
new file mode 100644
index 0000000..fe859b8
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.0.png
Binary files differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.png
new file mode 100644
index 0000000..5bd0477
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.1.png
Binary files differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.png b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.png
new file mode 100644
index 0000000..c6a109d
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.2.png
Binary files differ
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml
new file mode 100644
index 0000000..8dd1b3f
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/data/flickable-vertical.qml
@@ -0,0 +1,1107 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+ Frame {
+ msec: 0
+ }
+ Frame {
+ msec: 16
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 32
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 48
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 64
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 80
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 96
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 112
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 128
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 144
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 160
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 176
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 192
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 208
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 224
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 240
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 256
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 272
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 288
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 304
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 320
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 336
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 352
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 368
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 384
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 400
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 416
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 432
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 448
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 464
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 480
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 496
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 512
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 528
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 544
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 560
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 576
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 592
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 608
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 624
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 640
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 656
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 672
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 688
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 704
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 720
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 736
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 752
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 768
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 784
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 800
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Mouse {
+ type: 2
+ button: 1
+ buttons: 1
+ x: 202; y: 486
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 816
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 832
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 202; y: 484
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 848
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 202; y: 476
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 864
+ hash: "5700af521a36e043b526fbc6bd4fae6d"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 202; y: 466
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 880
+ hash: "4630b2b00646ad0c1083fbf1e03f8360"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 204; y: 448
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 896
+ hash: "45fd3c04fdb2d3efc0b5fd7231c71f27"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 207; y: 420
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 912
+ hash: "5f99f2d2f10e18b253f054defa476e4e"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 208; y: 380
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 928
+ hash: "de6ccfff15cb467cb3d19b03c159355c"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 208; y: 334
+ modifiers: 0
+ sendToViewport: true
+ }
+ Mouse {
+ type: 3
+ button: 1
+ buttons: 0
+ x: 208; y: 334
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 944
+ hash: "4211162f76e7f4409f25990573fc0e15"
+ }
+ Frame {
+ msec: 960
+ image: "flickable-vertical.0.png"
+ }
+ Frame {
+ msec: 976
+ hash: "2781d9edfd2739631f2f2592507dbd0d"
+ }
+ Frame {
+ msec: 992
+ hash: "52c0c2282722610a720190bef706aa2c"
+ }
+ Frame {
+ msec: 1008
+ hash: "6e179d49b5953a075c9e6c69ed24429b"
+ }
+ Frame {
+ msec: 1024
+ hash: "33f9ef1c95ea86bfec2060a7c325d1c6"
+ }
+ Frame {
+ msec: 1040
+ hash: "e27400e38908b8063a5af4c5b51fba8d"
+ }
+ Frame {
+ msec: 1056
+ hash: "23c7d81506e1f6db5b4383847d811a42"
+ }
+ Frame {
+ msec: 1072
+ hash: "a154380a4f3b70ffb5ffee68c12d83ad"
+ }
+ Frame {
+ msec: 1088
+ hash: "c615b3200246a13e3fb4d455bb7f9b24"
+ }
+ Frame {
+ msec: 1104
+ hash: "61e969a6d715ea6f401266e0839b073a"
+ }
+ Frame {
+ msec: 1120
+ hash: "2746787bb9ed352ef6887f6d650e9a27"
+ }
+ Frame {
+ msec: 1136
+ hash: "216c91c52456c1b511a2e948a4723472"
+ }
+ Frame {
+ msec: 1152
+ hash: "5eb299776e85f919e6859c0a9bb5ff47"
+ }
+ Frame {
+ msec: 1168
+ hash: "6c7e310e53f1a38a79c895876008203d"
+ }
+ Frame {
+ msec: 1184
+ hash: "456a40f98f6880a5802f2f1908c67b77"
+ }
+ Frame {
+ msec: 1200
+ hash: "441202576b91f52a86f7fb0be1e4b6a0"
+ }
+ Frame {
+ msec: 1216
+ hash: "a172758640806fa858ef54984a63857a"
+ }
+ Frame {
+ msec: 1232
+ hash: "495c9021925e32dec626a6c58dc45f5f"
+ }
+ Frame {
+ msec: 1248
+ hash: "f8d01621fee12fb707cbbe4cb847183a"
+ }
+ Frame {
+ msec: 1264
+ hash: "08d0b0a1b8414335c679aa36a9936f9d"
+ }
+ Frame {
+ msec: 1280
+ hash: "fcf3bdb7673fd15fcdd7ef7263398b96"
+ }
+ Frame {
+ msec: 1296
+ hash: "2520e8af0c82cf49763d7aae67044142"
+ }
+ Frame {
+ msec: 1312
+ hash: "afd3ebebf0b6b0428c262909c2a04361"
+ }
+ Frame {
+ msec: 1328
+ hash: "31c2193b3debf0148b95e3be28a65544"
+ }
+ Frame {
+ msec: 1344
+ hash: "f99ab54aac551ebfe65053bb9e34171f"
+ }
+ Frame {
+ msec: 1360
+ hash: "2b1974b713c90983da49fbe5f7d453af"
+ }
+ Frame {
+ msec: 1376
+ hash: "8420fd3909ae0dfdc9957d3ed95f4380"
+ }
+ Frame {
+ msec: 1392
+ hash: "9d44680f7713ecd31b76d8df6778ba0d"
+ }
+ Frame {
+ msec: 1408
+ hash: "caf78d799dbc6417dc446fe0becc3116"
+ }
+ Frame {
+ msec: 1424
+ hash: "6509c51422fb346c1573e6032e353211"
+ }
+ Frame {
+ msec: 1440
+ hash: "8572ce4c1e275bfb8a54c89932d02711"
+ }
+ Frame {
+ msec: 1456
+ hash: "e0278ae477d8f7d0551f00cabc022e9b"
+ }
+ Frame {
+ msec: 1472
+ hash: "7ce5dcbfad8e27505a8c47312f99777d"
+ }
+ Frame {
+ msec: 1488
+ hash: "f41f10d913b9bed3289303aa340b0c93"
+ }
+ Frame {
+ msec: 1504
+ hash: "3f15887e5bdfe7a432aed447370d457a"
+ }
+ Frame {
+ msec: 1520
+ hash: "3f15887e5bdfe7a432aed447370d457a"
+ }
+ Frame {
+ msec: 1536
+ hash: "3f15887e5bdfe7a432aed447370d457a"
+ }
+ Frame {
+ msec: 1552
+ hash: "dd9386a7e94bee43b29c554f0b5ec538"
+ }
+ Frame {
+ msec: 1568
+ hash: "21552c56a06b2989e3ad1e13aa315723"
+ }
+ Frame {
+ msec: 1584
+ hash: "e0278ae477d8f7d0551f00cabc022e9b"
+ }
+ Frame {
+ msec: 1600
+ hash: "9e0a1cd7e1687259f392cf7dd352134e"
+ }
+ Frame {
+ msec: 1616
+ hash: "15fd6ada534f44264b60509f4ba989bb"
+ }
+ Frame {
+ msec: 1632
+ hash: "a5745b138f31c1512c637ee920fc41bb"
+ }
+ Frame {
+ msec: 1648
+ hash: "caf78d799dbc6417dc446fe0becc3116"
+ }
+ Frame {
+ msec: 1664
+ hash: "e296831e72e684ec47f5a892dc7f3a22"
+ }
+ Frame {
+ msec: 1680
+ hash: "d8bc3e9eede3a8a2778ecd8d2421b4ff"
+ }
+ Frame {
+ msec: 1696
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1712
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1728
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1744
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1760
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1776
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1792
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1808
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1824
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1840
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1856
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1872
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1888
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1904
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1920
+ image: "flickable-vertical.1.png"
+ }
+ Frame {
+ msec: 1936
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1952
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1968
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 1984
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2000
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2016
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2032
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2048
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2064
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2080
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2096
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2112
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2128
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2144
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2160
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Mouse {
+ type: 2
+ button: 1
+ buttons: 1
+ x: 209; y: 122
+ modifiers: 0
+ sendToViewport: true
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 208; y: 122
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2176
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 208; y: 124
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2192
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Frame {
+ msec: 2208
+ hash: "e5a2b2f4b06732102b7d1412a61aff54"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 207; y: 130
+ modifiers: 0
+ sendToViewport: true
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 206; y: 141
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2224
+ hash: "313fc0d1531d8337ad4537f888915329"
+ }
+ Frame {
+ msec: 2240
+ hash: "313fc0d1531d8337ad4537f888915329"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 205; y: 160
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2256
+ hash: "91bd4c42569707dcf5f6495479b09ded"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 204; y: 188
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2272
+ hash: "ead7ecc4516b25cc31f64215cb283344"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 204; y: 226
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2288
+ hash: "b1260a5fabfd167428d2808d70a23346"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 207; y: 272
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2304
+ hash: "77c9ca5c46224bb12908f07d820bcb11"
+ }
+ Mouse {
+ type: 5
+ button: 0
+ buttons: 1
+ x: 210; y: 322
+ modifiers: 0
+ sendToViewport: true
+ }
+ Mouse {
+ type: 3
+ button: 1
+ buttons: 0
+ x: 210; y: 322
+ modifiers: 0
+ sendToViewport: true
+ }
+ Frame {
+ msec: 2320
+ hash: "7c44a727fb5173ee60b161381ddc8469"
+ }
+ Frame {
+ msec: 2336
+ hash: "7e92b161c55c56fc7ab2cad038b7346e"
+ }
+ Frame {
+ msec: 2352
+ hash: "a0178a8469b25aefcfcf6e5c5c2e1d8e"
+ }
+ Frame {
+ msec: 2368
+ hash: "ace207b8c382e90519553e607f97e026"
+ }
+ Frame {
+ msec: 2384
+ hash: "d6e329262546b3a7d986fd42b727f39f"
+ }
+ Frame {
+ msec: 2400
+ hash: "03131c2e53a770b771c62ee3d30fdce7"
+ }
+ Frame {
+ msec: 2416
+ hash: "f243a74942f8df796d0b81b4ec00e367"
+ }
+ Frame {
+ msec: 2432
+ hash: "b45dc3359a666d5b99decadfb7d0e7c6"
+ }
+ Frame {
+ msec: 2448
+ hash: "08363157dfa3ade159413e72947999b9"
+ }
+ Frame {
+ msec: 2464
+ hash: "59a5a5950bb46bf15694862f6d8f5435"
+ }
+ Frame {
+ msec: 2480
+ hash: "b538f5348d02d3c3443048fc36b4155b"
+ }
+ Frame {
+ msec: 2496
+ hash: "588c18ef48f2f93b60c1b6acf2f6c688"
+ }
+ Frame {
+ msec: 2512
+ hash: "181d307353f25b84dd13a603d6363408"
+ }
+ Frame {
+ msec: 2528
+ hash: "7c53b2cba936e45a82cfab46285e06cb"
+ }
+ Frame {
+ msec: 2544
+ hash: "ec7c45adf50c6d1a5adefb4cf344c7c2"
+ }
+ Frame {
+ msec: 2560
+ hash: "8981a12381fc9d564e7c9c9bb12e0b43"
+ }
+ Frame {
+ msec: 2576
+ hash: "c8505c9ef15ad7af27cc033f80354bd4"
+ }
+ Frame {
+ msec: 2592
+ hash: "c620ca4dc1abba3a8537dbb0537046bb"
+ }
+ Frame {
+ msec: 2608
+ hash: "2cbf3a865232b7775777ab2ad4949e5a"
+ }
+ Frame {
+ msec: 2624
+ hash: "08e2a6dc88b2eda23189450c33004422"
+ }
+ Frame {
+ msec: 2640
+ hash: "c0454b6f55d19f52a33769607215f91b"
+ }
+ Frame {
+ msec: 2656
+ hash: "e1f821a483df071a006b5995ddb9e762"
+ }
+ Frame {
+ msec: 2672
+ hash: "62b01646cba8eb49148199d32d8aba64"
+ }
+ Frame {
+ msec: 2688
+ hash: "6ed5f1ae6466d69f5003d22105270718"
+ }
+ Frame {
+ msec: 2704
+ hash: "3e1cad3731b06d08c7a508d57b7e7d43"
+ }
+ Frame {
+ msec: 2720
+ hash: "5a3bae328139a30eaa7e4e21463692c6"
+ }
+ Frame {
+ msec: 2736
+ hash: "41a6bfbef67bbdd5d2c58e92f960b9cd"
+ }
+ Frame {
+ msec: 2752
+ hash: "6a23e7788cf6aee5aab685cae3e3406b"
+ }
+ Frame {
+ msec: 2768
+ hash: "2a3dcdd4e9cb177ab4823820edbe11f9"
+ }
+ Frame {
+ msec: 2784
+ hash: "2a3dcdd4e9cb177ab4823820edbe11f9"
+ }
+ Frame {
+ msec: 2800
+ hash: "2a3dcdd4e9cb177ab4823820edbe11f9"
+ }
+ Frame {
+ msec: 2816
+ hash: "0daea30919fe78d07f0c44e1d1e2a054"
+ }
+ Frame {
+ msec: 2832
+ hash: "6a23e7788cf6aee5aab685cae3e3406b"
+ }
+ Frame {
+ msec: 2848
+ hash: "132f9dff5cf656cc451e70ef624a5762"
+ }
+ Frame {
+ msec: 2864
+ hash: "10dde1f1c7080c8331354f8233dc23d3"
+ }
+ Frame {
+ msec: 2880
+ image: "flickable-vertical.2.png"
+ }
+ Frame {
+ msec: 2896
+ hash: "00dfcaaa25ee8b89b33e6bfaf233fd25"
+ }
+ Frame {
+ msec: 2912
+ hash: "2802a4cf55f881ff391ef19935ff74ad"
+ }
+ Frame {
+ msec: 2928
+ hash: "2633a8581b29b2acb6ea04bc5a181855"
+ }
+ Frame {
+ msec: 2944
+ hash: "6ed5f1ae6466d69f5003d22105270718"
+ }
+ Frame {
+ msec: 2960
+ hash: "1ba3ccd82d16ea8176d8dd3f75819934"
+ }
+ Frame {
+ msec: 2976
+ hash: "1ba3ccd82d16ea8176d8dd3f75819934"
+ }
+ Frame {
+ msec: 2992
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3008
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3024
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3040
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3056
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3072
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3088
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3104
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3120
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3136
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3152
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3168
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3184
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3200
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3216
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3232
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3248
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3264
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3280
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3296
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3312
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3328
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3344
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3360
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3376
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3392
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3408
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3424
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3440
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3456
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3472
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3488
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3504
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3520
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3536
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3552
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3568
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3584
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3600
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Key {
+ type: 6
+ key: 16777249
+ modifiers: 67108864
+ text: ""
+ autorep: false
+ count: 1
+ }
+ Frame {
+ msec: 3616
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3632
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3648
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3664
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3680
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3696
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3712
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+ Frame {
+ msec: 3728
+ hash: "220ad54a212709243bb54b1ca1ad2ee2"
+ }
+}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml
new file mode 100644
index 0000000..a5e15d6
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-horizontal.qml
@@ -0,0 +1,30 @@
+import Qt 4.6
+
+Rectangle {
+ color: "lightSteelBlue"
+ width: 600; height: 300
+
+ ListModel {
+ id: List
+ ListElement { dayColor: "steelblue" }
+ ListElement { dayColor: "blue" }
+ ListElement { dayColor: "yellow" }
+ ListElement { dayColor: "purple" }
+ ListElement { dayColor: "red" }
+ ListElement { dayColor: "green" }
+ ListElement { dayColor: "orange" }
+ }
+
+ Flickable {
+ id: Flick
+ anchors.fill: parent; viewportWidth: row.width
+
+ Row {
+ id: row
+ Repeater {
+ model: List
+ Rectangle { width: 200; height: 300; color: dayColor }
+ }
+ }
+ }
+}
diff --git a/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
new file mode 100644
index 0000000..e6b0bf5
--- /dev/null
+++ b/tests/auto/declarative/visual/qmlgraphicsflickable/flickable-vertical.qml
@@ -0,0 +1,30 @@
+import Qt 4.6
+
+Rectangle {
+ color: "lightSteelBlue"
+ width: 300; height: 600
+
+ ListModel {
+ id: List
+ ListElement { dayColor: "steelblue" }
+ ListElement { dayColor: "blue" }
+ ListElement { dayColor: "yellow" }
+ ListElement { dayColor: "purple" }
+ ListElement { dayColor: "red" }
+ ListElement { dayColor: "green" }
+ ListElement { dayColor: "orange" }
+ }
+
+ Flickable {
+ id: Flick
+ anchors.fill: parent; viewportHeight: column.height
+
+ Column {
+ id: column
+ Repeater {
+ model: List
+ Rectangle { width: 300; height: 200; color: dayColor }
+ }
+ }
+ }
+}
diff --git a/tests/auto/declarative/visual/webview/zooming/renderControl.html b/tests/auto/declarative/visual/webview/zooming/renderControl.html
new file mode 100644
index 0000000..1a01a33
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/zooming/renderControl.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<h1>Render Control</h1>
+<p>
+This test shows how zooming and panning can be
+optimized for speed over quality by delaying rendering.
+<img src="qtlogo.png">