From 62dbc5d0bcae849af1dff393bb045a3ad8174ae7 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Tue, 3 Nov 2009 08:51:14 +1000
Subject: Remember host and port settings.

---
 tools/qmldebugger/standalone/main.cpp        |  3 +++
 tools/qmldebugger/standalone/qmldebugger.cpp | 29 +++++++++++++++++++---------
 tools/qmldebugger/standalone/qmldebugger.h   |  3 +++
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/tools/qmldebugger/standalone/main.cpp b/tools/qmldebugger/standalone/main.cpp
index 2f2a30e..715837e 100644
--- a/tools/qmldebugger/standalone/main.cpp
+++ b/tools/qmldebugger/standalone/main.cpp
@@ -45,6 +45,9 @@
 int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
+    app.setApplicationName("QtQmlDebugger");
+    app.setOrganizationName("Nokia");
+    app.setOrganizationDomain("nokia.com");    
 
     QStringList args = app.arguments();
 
diff --git a/tools/qmldebugger/standalone/qmldebugger.cpp b/tools/qmldebugger/standalone/qmldebugger.cpp
index afcf84c..4d86377 100644
--- a/tools/qmldebugger/standalone/qmldebugger.cpp
+++ b/tools/qmldebugger/standalone/qmldebugger.cpp
@@ -40,12 +40,14 @@
 ****************************************************************************/
 #include <QtCore/qtimer.h>
 #include <QtCore/qdebug.h>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QLineEdit>
-#include <QTabWidget>
-#include <QSpinBox>
-#include <QLabel>
+#include <QtCore/qsettings.h>
+
+#include <QtGui/qlayout.h>
+#include <QtGui/qpushbutton.h>
+#include <QtGui/qlineedit.h>
+#include <QtGui/qtabwidget.h>
+#include <QtGui/qspinbox.h>
+#include <QtGui/qlabel.h>
 
 #include "canvasframerate.h"
 #include "engine.h"
@@ -64,12 +66,10 @@ QmlDebugger::QmlDebugger(QWidget *parent)
     m_connectionState = new QLabel(this);
     connectLayout->addWidget(m_connectionState);
     m_host = new QLineEdit(this);
-    m_host->setText("127.0.0.1");
     connectLayout->addWidget(m_host);
     m_port = new QSpinBox(this);
     m_port->setMinimum(1024);
     m_port->setMaximum(20000);
-    m_port->setValue(3768);
     connectLayout->addWidget(m_port);
     m_connectButton = new QPushButton(tr("Connect"), this);
     QObject::connect(m_connectButton, SIGNAL(clicked()), 
@@ -99,7 +99,9 @@ QmlDebugger::QmlDebugger(QWidget *parent)
     QObject::connect(&client, SIGNAL(error(QAbstractSocket::SocketError)),
                      this, SLOT(connectionError(QAbstractSocket::SocketError)));
 
-    m_tabs->setCurrentIndex(1);
+    QSettings settings;
+    m_host->setText(settings.value("Host", "127.0.0.1").toString());
+    m_port->setValue(settings.value("Port", 3768).toInt());
     
     connectToHost();
 }
@@ -119,6 +121,15 @@ void QmlDebugger::showEngineTab()
     m_tabs->setCurrentWidget(m_enginePane);
 }
 
+void QmlDebugger::closeEvent(QCloseEvent *event)
+{
+    QSettings settings;
+    settings.setValue("Host", m_host->text());
+    settings.setValue("Port", m_port->value());
+
+    QWidget::closeEvent(event);
+}
+
 void QmlDebugger::connectionStateChanged()
 {
     switch (client.state()) {
diff --git a/tools/qmldebugger/standalone/qmldebugger.h b/tools/qmldebugger/standalone/qmldebugger.h
index 7bacce7..da95ef9 100644
--- a/tools/qmldebugger/standalone/qmldebugger.h
+++ b/tools/qmldebugger/standalone/qmldebugger.h
@@ -67,6 +67,9 @@ public slots:
     void connectToHost();
     void disconnectFromHost();
 
+protected:
+    void closeEvent(QCloseEvent *);
+    
 private slots:
     void connectionStateChanged();
     void connectionError(QAbstractSocket::SocketError socketError);
-- 
cgit v0.12


From 2eb395fc1bce47599ed9de453a84d102a4920727 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Tue, 3 Nov 2009 08:51:55 +1000
Subject: Various UI changes: added graph labels and 'clear' button, changed
 'enabled' checkbox to group box and changed embedded scrollbar to external
 slider.

---
 tools/qmldebugger/standalone/canvasframerate.cpp | 213 ++++++++++++++++-------
 tools/qmldebugger/standalone/canvasframerate.h   |  13 +-
 2 files changed, 155 insertions(+), 71 deletions(-)

diff --git a/tools/qmldebugger/standalone/canvasframerate.cpp b/tools/qmldebugger/standalone/canvasframerate.cpp
index 408e8d0..0921be0 100644
--- a/tools/qmldebugger/standalone/canvasframerate.cpp
+++ b/tools/qmldebugger/standalone/canvasframerate.cpp
@@ -38,23 +38,26 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "canvasframerate.h"
-#include <QtGui/qwidget.h>
-#include <QtGui/qpainter.h>
-#include <QtGui/qscrollbar.h>
-#include <private/qmldebugclient_p.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdatastream.h>
+
+#include <QtGui/qpainter.h>
+#include <QtGui/qslider.h>
+#include <QtGui/qscrollbar.h>
+#include <QtGui/qspinbox.h>
+#include <QtGui/qgroupbox.h>
 #include <QtGui/qboxlayout.h>
+#include <QtGui/qlabel.h>
+#include <QtGui/qlineedit.h>
+#include <QtGui/qpushbutton.h>
+#include <QtGui/qtabwidget.h>
+
 #include <QResizeEvent>
 #include <QShowEvent>
-#include <QTabWidget>
-#include <QPushButton>
-#include <QLineEdit>
-#include <QCheckBox>
-#include <QSpinBox>
-#include <QLabel>
+
+#include <private/qmldebugclient_p.h>
+#include "canvasframerate.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -62,22 +65,23 @@ class QLineGraph : public QWidget
 {
 Q_OBJECT
 public:
-    QLineGraph(QWidget * = 0);
+    QLineGraph(QAbstractSlider *slider, QWidget * = 0);
 
     void setPosition(int);
 
 public slots:
     void addSample(int, int, int, bool);
     void setResolutionForHeight(int);
+    void clear();
 
 protected:
     virtual void paintEvent(QPaintEvent *);
 
 private slots:
-    void scrollbarChanged(int);
+    void sliderChanged(int);
 
 private:
-    void updateScrollbar();
+    void updateSlider();
     void drawSample(QPainter *, int, const QRect &);
     void drawTime(QPainter *, const QRect &);
     struct Sample { 
@@ -86,50 +90,53 @@ private:
     };
     QList<Sample> _samples;
 
-    QScrollBar sb;
+    QAbstractSlider *slider;
     int position;
     int samplesPerWidth;
     int resolutionForHeight;
     bool ignoreScroll;
 };
 
-QLineGraph::QLineGraph(QWidget *parent)
-: QWidget(parent), sb(Qt::Horizontal, this), position(-1), samplesPerWidth(99), resolutionForHeight(50), ignoreScroll(false)
+QLineGraph::QLineGraph(QAbstractSlider *slider, QWidget *parent)
+: QWidget(parent), slider(slider), position(-1), samplesPerWidth(99), resolutionForHeight(50), ignoreScroll(false)
 {
     setMinimumHeight(200);
 
-    sb.setMaximum(0);
-    sb.setMinimum(0);
-    sb.setSingleStep(1);
-
-    QVBoxLayout *layout = new QVBoxLayout;
-    setLayout(layout);
-    layout->addStretch(2);
-    layout->addWidget(&sb);
-    QObject::connect(&sb, SIGNAL(valueChanged(int)), this, SLOT(scrollbarChanged(int)));
+    slider->setMaximum(0);
+    slider->setMinimum(0);
+    slider->setSingleStep(1);
+    
+    connect(slider, SIGNAL(valueChanged(int)), this, SLOT(sliderChanged(int)));
 }
 
-void QLineGraph::scrollbarChanged(int v)
+void QLineGraph::sliderChanged(int v)
 {
     if(ignoreScroll)
         return;
 
-    if (v == sb.maximum())
+    if (v == slider->maximum())
         position = -1;
     else
         position = v;
     update();
 }
 
-void QLineGraph::updateScrollbar()
+void QLineGraph::clear()
+{
+    _samples.clear();
+    updateSlider();
+    update();
+}
+
+void QLineGraph::updateSlider()
 {
     ignoreScroll = true;
-    sb.setMaximum(qMax(0, _samples.count() - samplesPerWidth - 1));
+    slider->setMaximum(qMax(0, _samples.count() - samplesPerWidth - 1));
 
     if(position == -1) {
-        sb.setValue(sb.maximum());
+        slider->setValue(slider->maximum());
     } else {
-        sb.setValue(position);
+        slider->setValue(position);
     }
     ignoreScroll = false;
 }
@@ -142,13 +149,13 @@ void QLineGraph::addSample(int a, int b, int d, bool isBreak)
     s.sample[1] = b;
     s.sample[2] = d;
     _samples << s;
-    updateScrollbar();
+    updateSlider();
     update();
 }
 
 void QLineGraph::setPosition(int p)
 {
-    scrollbarChanged(p);
+    sliderChanged(p);
 }
 
 void QLineGraph::drawTime(QPainter *p, const QRect &rect)
@@ -218,7 +225,14 @@ void QLineGraph::paintEvent(QPaintEvent *)
     QPainter p(this);
     p.setRenderHint(QPainter::Antialiasing);
 
-    QRect r(50, 10, width() - 60, height() - 60);
+    QRect r(65, 10, width() - 71, height() - 40);
+
+    p.save();
+    p.rotate(-90);
+    p.translate(-r.height()/2 - r.width()/2 - 71, -r.height()/2);
+    p.drawText(r, Qt::AlignCenter, tr("Time per frame (ms)"));
+    p.restore();
+
     p.setBrush(QColor("lightsteelblue"));
     drawSample(&p, 0, r);
 
@@ -228,6 +242,8 @@ void QLineGraph::paintEvent(QPaintEvent *)
     p.setBrush(Qt::NoBrush);
     p.drawRect(r);
 
+    slider->setGeometry(x() + r.x(), slider->y(), r.width(), slider->height());
+
     for(int ii = 0; ii <= resolutionForHeight; ++ii) {
         int y = 1 + r.bottom() - ii * r.height() / resolutionForHeight;
 
@@ -249,9 +265,58 @@ void QLineGraph::setResolutionForHeight(int resolution)
     update();
 }
 
+
+class GraphWindow : public QWidget
+{
+    Q_OBJECT
+public:
+    GraphWindow(QWidget *parent = 0);
+
+public slots:
+    void addSample(int, int, int, bool);
+    void setResolutionForHeight(int);
+    void clear();
+
+private:
+    QLineGraph *m_graph;
+};
+
+GraphWindow::GraphWindow(QWidget *parent)
+    : QWidget(parent)
+{
+    QSlider *scroll = new QSlider(Qt::Horizontal);
+    m_graph = new QLineGraph(scroll);
+
+    QLabel *label = new QLabel(tr("Total time elapsed (ms)"));
+    label->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 5, 5);
+    layout->setSpacing(0);
+    layout->addWidget(m_graph);
+    layout->addWidget(label, 0, Qt::AlignHCenter);
+    layout->addWidget(scroll);
+}
+
+void GraphWindow::addSample(int a, int b, int d, bool isBreak)
+{
+    m_graph->addSample(a, b, d, isBreak);
+}
+
+void GraphWindow::setResolutionForHeight(int res)
+{
+    m_graph->setResolutionForHeight(res);
+}
+
+void GraphWindow::clear()
+{
+    m_graph->clear();
+}
+
+
 class CanvasFrameRatePlugin : public QmlDebugClient
 {
-Q_OBJECT
+    Q_OBJECT
 public:
     CanvasFrameRatePlugin(QmlDebugConnection *client);
 
@@ -290,38 +355,44 @@ CanvasFrameRate::CanvasFrameRate(QWidget *parent)
 : QWidget(parent),
   m_plugin(0)
 {
-    QVBoxLayout *layout = new QVBoxLayout;
-    layout->setContentsMargins(0,0,0,0);
-    layout->setSpacing(0);
-    setLayout(layout);
-
     m_tabs = new QTabWidget(this);
-    layout->addWidget(m_tabs);
 
     QHBoxLayout *bottom = new QHBoxLayout;
-    bottom->setContentsMargins(5, 0, 5, 0);
+    bottom->setMargin(0);
     bottom->setSpacing(10);
-    layout->addLayout(bottom);
-
-    QLabel *label = new QLabel("Resolution", this);
-    bottom->addWidget(label);
 
-    m_spin = new QSpinBox(this);
-    m_spin->setRange(50,200);
-    m_spin->setValue(50);
-    m_spin->setSuffix("ms");
-    bottom->addWidget(m_spin);
+    m_res = new QSpinBox;
+    m_res->setRange(50, 200);
+    m_res->setValue(m_res->minimum());
+    m_res->setSingleStep(10);
+    m_res->setSuffix(QLatin1String("ms"));
+    bottom->addWidget(new QLabel(tr("Resolution:")));
+    bottom->addWidget(m_res);
 
-    bottom->addStretch(2);
+    bottom->addStretch();
 
-    m_enabledCheckBox = new QCheckBox("Enable", this);
-    bottom->addWidget(m_enabledCheckBox);
-    QObject::connect(m_enabledCheckBox, SIGNAL(stateChanged(int)), 
-                     this, SLOT(enabledStateChanged(int)));
+    m_clearButton = new QPushButton(tr("Clear"));
+    connect(m_clearButton, SIGNAL(clicked()), SLOT(clearGraph()));
+    bottom->addWidget(m_clearButton);
 
-    QPushButton *pb = new QPushButton(tr("New Tab"), this);
-    QObject::connect(pb, SIGNAL(clicked()), this, SLOT(newTab()));
+    QPushButton *pb = new QPushButton(tr("New Graph"), this);
+    connect(pb, SIGNAL(clicked()), this, SLOT(newTab()));
     bottom->addWidget(pb);
+    
+    m_group = new QGroupBox(tr("Enabled"));
+    m_group->setCheckable(true);
+    m_group->setChecked(false);
+    connect(m_group, SIGNAL(toggled(bool)), SLOT(enabledToggled(bool)));
+
+    QVBoxLayout *groupLayout = new QVBoxLayout(m_group);
+    groupLayout->addWidget(m_tabs);
+    groupLayout->addLayout(bottom);
+    
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setMargin(0);
+    layout->setSpacing(0);
+    layout->addWidget(m_group);
+    setLayout(layout);
 }
 
 void CanvasFrameRate::reset(QmlDebugConnection *conn)
@@ -358,7 +429,7 @@ void CanvasFrameRate::handleConnected(QmlDebugConnection *conn)
 {
     delete m_plugin;
     m_plugin = new CanvasFrameRatePlugin(conn);
-    enabledStateChanged(m_enabledCheckBox->checkState());
+    enabledToggled(m_group->isChecked());
     newTab();
 }
 
@@ -372,6 +443,14 @@ QSize CanvasFrameRate::sizeHint() const
     return m_sizeHint;
 }
 
+void CanvasFrameRate::clearGraph()
+{
+    if (m_tabs->count()) {
+        GraphWindow *w = qobject_cast<GraphWindow*>(m_tabs->widget(m_tabs->count() - 1));
+        w->clear();
+    }
+}
+
 void CanvasFrameRate::newTab()
 {
     if (!m_plugin)
@@ -385,20 +464,20 @@ void CanvasFrameRate::newTab()
 
     int id = m_tabs->count();
 
-    QLineGraph *graph = new QLineGraph(this);
-    QObject::connect(m_plugin, SIGNAL(sample(int,int,int,bool)),
-                     graph, SLOT(addSample(int,int,int,bool)));
-    QObject::connect(m_spin, SIGNAL(valueChanged(int)), graph, SLOT(setResolutionForHeight(int)));
+    GraphWindow *graph = new GraphWindow;
+    graph->setResolutionForHeight(m_res->value());
+    connect(m_plugin, SIGNAL(sample(int,int,int,bool)),
+            graph, SLOT(addSample(int,int,int,bool)));
+    connect(m_res, SIGNAL(valueChanged(int)),
+            graph, SLOT(setResolutionForHeight(int)));
 
     QString name = QLatin1String("Graph ") + QString::number(id);
     m_tabs->addTab(graph, name);
     m_tabs->setCurrentIndex(id);
 }
 
-void CanvasFrameRate::enabledStateChanged(int s)
+void CanvasFrameRate::enabledToggled(bool checked)
 {
-    bool checked = s != 0;
-
     if (m_plugin)
         static_cast<QmlDebugClient *>(m_plugin)->setEnabled(checked);
 }
diff --git a/tools/qmldebugger/standalone/canvasframerate.h b/tools/qmldebugger/standalone/canvasframerate.h
index be6bbc6..f8eec59 100644
--- a/tools/qmldebugger/standalone/canvasframerate.h
+++ b/tools/qmldebugger/standalone/canvasframerate.h
@@ -49,8 +49,11 @@
 QT_BEGIN_NAMESPACE
 
 class QTabWidget;
+class QSlider;
+class QGroupBox;
+class QLabel;
 class QSpinBox;
-class QCheckBox;
+class QPushButton;
 
 class CanvasFrameRatePlugin;
 
@@ -66,18 +69,20 @@ public:
     virtual QSize sizeHint() const;
 
 private slots:
+    void clearGraph();
     void newTab();
-    void enabledStateChanged(int);
+    void enabledToggled(bool);
     void connectionStateChanged(QAbstractSocket::SocketState state);
 
 private:
     void handleConnected(QmlDebugConnection *conn);
 
+    QGroupBox *m_group;
     QTabWidget *m_tabs;
-    QSpinBox *m_spin;
+    QSpinBox *m_res;
+    QPushButton *m_clearButton;
     CanvasFrameRatePlugin *m_plugin;
     QSize m_sizeHint;
-    QCheckBox *m_enabledCheckBox;
 };
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From e0688cfd4d9a31d53b456d0c211ab39565305064 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Tue, 3 Nov 2009 16:02:49 +1000
Subject: Add tooltip and bar highlight when cursor is hovered over a graph
 bar.

---
 tools/qmldebugger/standalone/canvasframerate.cpp | 115 ++++++++++++++++++-----
 1 file changed, 94 insertions(+), 21 deletions(-)

diff --git a/tools/qmldebugger/standalone/canvasframerate.cpp b/tools/qmldebugger/standalone/canvasframerate.cpp
index 0921be0..63e04ed 100644
--- a/tools/qmldebugger/standalone/canvasframerate.cpp
+++ b/tools/qmldebugger/standalone/canvasframerate.cpp
@@ -41,8 +41,10 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qdatastream.h>
+#include <QtCore/qmargins.h>
 
 #include <QtGui/qpainter.h>
+#include <QtGui/qtooltip.h>
 #include <QtGui/qslider.h>
 #include <QtGui/qscrollbar.h>
 #include <QtGui/qspinbox.h>
@@ -76,14 +78,17 @@ public slots:
 
 protected:
     virtual void paintEvent(QPaintEvent *);
+    virtual void mouseMoveEvent(QMouseEvent *);
+    virtual void leaveEvent(QEvent *);
 
 private slots:
     void sliderChanged(int);
 
 private:
     void updateSlider();
-    void drawSample(QPainter *, int, const QRect &);
+    void drawSample(QPainter *, int, const QRect &, QList<QRect> *);
     void drawTime(QPainter *, const QRect &);
+    QRect findContainingRect(const QList<QRect> &rects, const QPoint &pos) const;
     struct Sample { 
         int sample[3];
         bool isBreak;
@@ -95,12 +100,18 @@ private:
     int samplesPerWidth;
     int resolutionForHeight;
     bool ignoreScroll;
+    QMargins graphMargins;
+
+    QList<QRect> rectsPaintTime;    // time to do a paintEvent()
+    QList<QRect> rectsTimeBetween;  // time between frames
+    QRect highlightedBar;
 };
 
 QLineGraph::QLineGraph(QAbstractSlider *slider, QWidget *parent)
-: QWidget(parent), slider(slider), position(-1), samplesPerWidth(99), resolutionForHeight(50), ignoreScroll(false)
+: QWidget(parent), slider(slider), position(-1), samplesPerWidth(99), resolutionForHeight(50),
+  ignoreScroll(false), graphMargins(65, 10, 71, 40)
 {
-    setMinimumHeight(200);
+    setMouseTracking(true);
 
     slider->setMaximum(0);
     slider->setMinimum(0);
@@ -124,6 +135,11 @@ void QLineGraph::sliderChanged(int v)
 void QLineGraph::clear()
 {
     _samples.clear();
+    rectsPaintTime.clear();
+    rectsTimeBetween.clear();
+    highlightedBar = QRect();
+    position = -1;
+
     updateSlider();
     update();
 }
@@ -189,7 +205,7 @@ void QLineGraph::drawTime(QPainter *p, const QRect &rect)
 
 }
 
-void QLineGraph::drawSample(QPainter *p, int s, const QRect &rect)
+void QLineGraph::drawSample(QPainter *p, int s, const QRect &rect, QList<QRect> *record)
 {
     if(_samples.isEmpty())
         return;
@@ -212,8 +228,11 @@ void QLineGraph::drawSample(QPainter *p, int s, const QRect &rect)
         xEnd = rect.left() + scaleX * (ii - first);
         int yEnd = rect.bottom() - _samples.at(ii).sample[s] * scaleY;
 
-        if (!(s == 0 && _samples.at(ii).isBreak)) 
-            p->drawRect(QRect(lastXEnd, yEnd, scaleX, _samples.at(ii).sample[s] * scaleY));
+        if (!(s == 0 && _samples.at(ii).isBreak)) {
+            QRect bar(lastXEnd, yEnd, scaleX, _samples.at(ii).sample[s] * scaleY);
+            record->append(bar);
+            p->drawRect(bar);
+        }
 
         lastXEnd = xEnd;
     }
@@ -225,19 +244,27 @@ void QLineGraph::paintEvent(QPaintEvent *)
     QPainter p(this);
     p.setRenderHint(QPainter::Antialiasing);
 
-    QRect r(65, 10, width() - 71, height() - 40);
+    QRect r(graphMargins.left(), graphMargins.top(),
+            width() - graphMargins.right(), height() - graphMargins.bottom());
 
     p.save();
     p.rotate(-90);
-    p.translate(-r.height()/2 - r.width()/2 - 71, -r.height()/2);
+    p.translate(-r.height()/2 - r.width()/2 - graphMargins.right(), -r.height()/2);
     p.drawText(r, Qt::AlignCenter, tr("Time per frame (ms)"));
     p.restore();
 
     p.setBrush(QColor("lightsteelblue"));
-    drawSample(&p, 0, r);
+    rectsTimeBetween.clear();
+    drawSample(&p, 0, r, &rectsTimeBetween);
 
     p.setBrush(QColor("pink"));
-    drawSample(&p, 1, r);
+    rectsPaintTime.clear();
+    drawSample(&p, 1, r, &rectsPaintTime);
+
+    if (!highlightedBar.isNull()) {
+        p.setBrush(Qt::darkGreen);
+        p.drawRect(highlightedBar);
+    }
 
     p.setBrush(Qt::NoBrush);
     p.drawRect(r);
@@ -259,12 +286,50 @@ void QLineGraph::paintEvent(QPaintEvent *)
     drawTime(&p, r);
 }
 
+void QLineGraph::mouseMoveEvent(QMouseEvent *event)
+{
+    QPoint pos = event->pos();
+
+    QRect rect = findContainingRect(rectsPaintTime, pos);
+    if (rect.isNull())
+        rect = findContainingRect(rectsTimeBetween, pos);
+
+    if (!highlightedBar.isNull())
+        update(highlightedBar.adjusted(-1, -1, 1, 1));
+    highlightedBar = rect;
+
+    if (!rect.isNull()) {
+        QRect graph(graphMargins.left(), graphMargins.top(),
+                    width() - graphMargins.right(), height() - graphMargins.bottom());
+        qreal scaleY = qreal(graph.height()) / resolutionForHeight;
+        QToolTip::showText(event->globalPos(), QString::number(qRound(rect.height() / scaleY)), this, rect);
+        update(rect.adjusted(-1, -1, 1, 1));
+    }
+}
+
+void QLineGraph::leaveEvent(QEvent *)
+{
+    if (!highlightedBar.isNull()) {
+        highlightedBar = QRect();
+        update(highlightedBar.adjusted(-1, -1, 1, 1));
+    }
+}
+
 void QLineGraph::setResolutionForHeight(int resolution)
 {
     resolutionForHeight = resolution;
     update();
 }
 
+QRect QLineGraph::findContainingRect(const QList<QRect> &rects, const QPoint &pos) const
+{
+    for (int i=0; i<rects.count(); i++) {
+        if (rects[i].contains(pos))
+            return rects[i]; 
+    }
+    return QRect();
+}
+
 
 class GraphWindow : public QWidget
 {
@@ -285,17 +350,20 @@ GraphWindow::GraphWindow(QWidget *parent)
     : QWidget(parent)
 {
     QSlider *scroll = new QSlider(Qt::Horizontal);
+    scroll->setFocusPolicy(Qt::WheelFocus);
     m_graph = new QLineGraph(scroll);
 
-    QLabel *label = new QLabel(tr("Total time elapsed (ms)"));
-    label->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
+    setFocusPolicy(Qt::WheelFocus);
+    setFocusProxy(scroll);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 5, 5);
     layout->setSpacing(0);
-    layout->addWidget(m_graph);
-    layout->addWidget(label, 0, Qt::AlignHCenter);
+    layout->addWidget(m_graph, 2);
+    layout->addWidget(new QLabel(tr("Total time elapsed (ms)")), 0, Qt::AlignHCenter);
     layout->addWidget(scroll);
+
+    setMinimumSize(QSize(400, 200));
 }
 
 void GraphWindow::addSample(int a, int b, int d, bool isBreak)
@@ -362,7 +430,7 @@ CanvasFrameRate::CanvasFrameRate(QWidget *parent)
     bottom->setSpacing(10);
 
     m_res = new QSpinBox;
-    m_res->setRange(50, 200);
+    m_res->setRange(30, 200);
     m_res->setValue(m_res->minimum());
     m_res->setSingleStep(10);
     m_res->setSuffix(QLatin1String("ms"));
@@ -385,14 +453,18 @@ CanvasFrameRate::CanvasFrameRate(QWidget *parent)
     connect(m_group, SIGNAL(toggled(bool)), SLOT(enabledToggled(bool)));
 
     QVBoxLayout *groupLayout = new QVBoxLayout(m_group);
+    groupLayout->setContentsMargins(5, 0, 5, 0);
+    groupLayout->setSpacing(5);
     groupLayout->addWidget(m_tabs);
     groupLayout->addLayout(bottom);
     
     QVBoxLayout *layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 15, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_group);
     setLayout(layout);
+
+    setFocusPolicy(Qt::StrongFocus);
 }
 
 void CanvasFrameRate::reset(QmlDebugConnection *conn)
@@ -446,8 +518,9 @@ QSize CanvasFrameRate::sizeHint() const
 void CanvasFrameRate::clearGraph()
 {
     if (m_tabs->count()) {
-        GraphWindow *w = qobject_cast<GraphWindow*>(m_tabs->widget(m_tabs->count() - 1));
-        w->clear();
+        GraphWindow *w = qobject_cast<GraphWindow*>(m_tabs->currentWidget());
+        if (w)
+            w->clear();
     }
 }
 
@@ -462,7 +535,7 @@ void CanvasFrameRate::newTab()
                             w, SLOT(addSample(int,int,int,bool)));
     }
 
-    int id = m_tabs->count();
+    int count = m_tabs->count();
 
     GraphWindow *graph = new GraphWindow;
     graph->setResolutionForHeight(m_res->value());
@@ -471,9 +544,9 @@ void CanvasFrameRate::newTab()
     connect(m_res, SIGNAL(valueChanged(int)),
             graph, SLOT(setResolutionForHeight(int)));
 
-    QString name = QLatin1String("Graph ") + QString::number(id);
+    QString name = QLatin1String("Graph ") + QString::number(count + 1);
     m_tabs->addTab(graph, name);
-    m_tabs->setCurrentIndex(id);
+    m_tabs->setCurrentIndex(count);
 }
 
 void CanvasFrameRate::enabledToggled(bool checked)
-- 
cgit v0.12


From 7a249a72f118f5adacc7ca3af498ac6434dc8c65 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Wed, 4 Nov 2009 14:30:21 +1000
Subject: Show source file and line of an object in the text editor when it is
 double clicked in the object tree.

---
 tools/qmldebugger/creatorplugin/creatorplugin.pro  |  1 +
 .../qmldebugger/creatorplugin/qmlinspectormode.cpp | 24 ++++++++++++++++++++++
 tools/qmldebugger/creatorplugin/qmlinspectormode.h |  2 ++
 tools/qmldebugger/standalone/objecttree.cpp        | 20 +++++++++++++-----
 tools/qmldebugger/standalone/objecttree.h          |  2 ++
 5 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/tools/qmldebugger/creatorplugin/creatorplugin.pro b/tools/qmldebugger/creatorplugin/creatorplugin.pro
index d191a37..ff7f3da 100644
--- a/tools/qmldebugger/creatorplugin/creatorplugin.pro
+++ b/tools/qmldebugger/creatorplugin/creatorplugin.pro
@@ -25,5 +25,6 @@ IDE_BUILD_TREE=$$(CREATOR_BUILD_DIR)
 include($$(CREATOR_SRC_DIR)/src/qtcreatorplugin.pri)
 include($$(CREATOR_SRC_DIR)/src/plugins/projectexplorer/projectexplorer.pri)
 include($$(CREATOR_SRC_DIR)/src/plugins/coreplugin/coreplugin.pri)
+include($$(CREATOR_SRC_DIR)/src/plugins/texteditor/texteditor.pri)
 LIBS += -L$$(CREATOR_BUILD_DIR)/lib/qtcreator
 
diff --git a/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp b/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp
index a1ca2fc..ce8ef30 100644
--- a/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp
+++ b/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp
@@ -65,6 +65,8 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/actionmanager/actionmanager.h>
 
+#include <texteditor/itexteditor.h>
+
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -435,8 +437,12 @@ void QmlInspectorMode::initWidgets()
     WatchTableHeaderView *header = new WatchTableHeaderView(m_watchTableModel);
     m_watchTableView->setHorizontalHeader(header);
 
+    connect(m_objectTreeWidget, SIGNAL(activated(QmlDebugObjectReference)),
+            this, SLOT(treeObjectActivated(QmlDebugObjectReference)));
+
     connect(m_objectTreeWidget, SIGNAL(currentObjectChanged(QmlDebugObjectReference)),
             m_propertiesWidget, SLOT(reload(QmlDebugObjectReference)));
+
     connect(m_objectTreeWidget, SIGNAL(expressionWatchRequested(QmlDebugObjectReference,QString)),
             m_watchTableModel, SLOT(expressionWatchRequested(QmlDebugObjectReference,QString)));
 
@@ -536,6 +542,24 @@ void QmlInspectorMode::contextChanged()
     delete m_contextQuery; m_contextQuery = 0;
 }
 
+void QmlInspectorMode::treeObjectActivated(const QmlDebugObjectReference &obj)
+{
+    QmlDebugFileReference source = obj.source();
+    QString fileName = source.url().toLocalFile();
+
+    if (source.lineNumber() < 0 || !QFile::exists(fileName))
+        return;
+
+    Core::EditorManager *editorManager = Core::EditorManager::instance();
+    TextEditor::ITextEditor *editor = qobject_cast<TextEditor::ITextEditor*>(editorManager->openEditor(fileName));
+    if (editor) {
+        editorManager->ensureEditorManagerVisible();
+        editorManager->addCurrentPositionToNavigationHistory();
+        editor->gotoLine(source.lineNumber());
+        editor->widget()->setFocus();
+    }
+}
+
 QT_END_NAMESPACE
 
 #include "qmlinspectormode.moc"
diff --git a/tools/qmldebugger/creatorplugin/qmlinspectormode.h b/tools/qmldebugger/creatorplugin/qmlinspectormode.h
index 93c2e44..b4158f1 100644
--- a/tools/qmldebugger/creatorplugin/qmlinspectormode.h
+++ b/tools/qmldebugger/creatorplugin/qmlinspectormode.h
@@ -57,6 +57,7 @@ class QmlEngineDebug;
 class QmlDebugConnection;
 class QmlDebugEnginesQuery;
 class QmlDebugRootContextQuery;
+class QmlDebugObjectReference;
 class ObjectTree;
 class WatchTableModel;
 class WatchTableView;
@@ -92,6 +93,7 @@ private slots:
     void enginesChanged();
     void queryEngineContext(int);
     void contextChanged();
+    void treeObjectActivated(const QmlDebugObjectReference &obj);
 
 private:
     struct Actions {
diff --git a/tools/qmldebugger/standalone/objecttree.cpp b/tools/qmldebugger/standalone/objecttree.cpp
index b06d377..4dbc1a7 100644
--- a/tools/qmldebugger/standalone/objecttree.cpp
+++ b/tools/qmldebugger/standalone/objecttree.cpp
@@ -59,9 +59,12 @@ ObjectTree::ObjectTree(QmlEngineDebug *client, QWidget *parent)
 {
     setHeaderHidden(true);
     setMinimumWidth(250);
+    setExpandsOnDoubleClick(false);
 
     connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
-            this, SLOT(currentItemChanged(QTreeWidgetItem *)));
+            SLOT(currentItemChanged(QTreeWidgetItem *)));
+    connect(this, SIGNAL(itemActivated(QTreeWidgetItem *, int)),
+            SLOT(activated(QTreeWidgetItem *)));            
 }
 
 void ObjectTree::setEngineDebug(QmlEngineDebug *client)
@@ -113,11 +116,18 @@ void ObjectTree::currentItemChanged(QTreeWidgetItem *item)
         return;
 
     QmlDebugObjectReference obj = item->data(0, Qt::UserRole).value<QmlDebugObjectReference>();
-    if (obj.debugId() < 0) {
-        qWarning("QML Object Tree: bad object id");
+    if (obj.debugId() >= 0)
+        emit currentObjectChanged(obj);
+}
+
+void ObjectTree::activated(QTreeWidgetItem *item)
+{
+    if (!item)
         return;
-    }
-    emit currentObjectChanged(obj);
+
+    QmlDebugObjectReference obj = item->data(0, Qt::UserRole).value<QmlDebugObjectReference>();
+    if (obj.debugId() >= 0)
+        emit activated(obj);
 }
 
 void ObjectTree::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem *parent)
diff --git a/tools/qmldebugger/standalone/objecttree.h b/tools/qmldebugger/standalone/objecttree.h
index f7b3a3f..c8d625c 100644
--- a/tools/qmldebugger/standalone/objecttree.h
+++ b/tools/qmldebugger/standalone/objecttree.h
@@ -64,6 +64,7 @@ public:
     
 signals:
     void currentObjectChanged(const QmlDebugObjectReference &);
+    void activated(const QmlDebugObjectReference &);
     void expressionWatchRequested(const QmlDebugObjectReference &, const QString &);
 
 public slots:
@@ -76,6 +77,7 @@ protected:
 private slots:
     void objectFetched();
     void currentItemChanged(QTreeWidgetItem *);
+    void activated(QTreeWidgetItem *);
 
 private:
     QTreeWidgetItem *findItemByObjectId(int debugId) const;
-- 
cgit v0.12


From f447e64f378fdebea3b8f2fca5624f48546a0529 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Wed, 4 Nov 2009 16:20:56 +1000
Subject: Use QML type names in object tree

---
 src/declarative/qml/qmlenginedebug.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 2d8acf7..52d54b9 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -271,10 +271,18 @@ QmlEngineDebugServer::objectData(QObject *object)
     }
 
     rv.objectName = object->objectName();
-    rv.objectType = QString::fromUtf8(object->metaObject()->className());
     rv.objectId = QmlDebugService::idForObject(object);
     rv.contextId = QmlDebugService::idForObject(qmlContext(object));
 
+    QmlType *type = QmlMetaType::qmlType(object->metaObject());
+    if (type) {
+        QString typeName = type->qmlTypeName();
+        int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
+        rv.objectType = lastSlash < 0 ? typeName : typeName.mid(lastSlash+1);
+    } else {
+        rv.objectType = QString::fromUtf8(object->metaObject()->className());
+    }
+
     return rv;
 }
 
-- 
cgit v0.12


From 3babe49011d363aaaabafb70bfb0626217ec8959 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Thu, 5 Nov 2009 13:54:25 +1000
Subject: Move graph slider when graph gets wheel event.

---
 tools/qmldebugger/standalone/canvasframerate.cpp | 43 ++++++++++++++++++------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/tools/qmldebugger/standalone/canvasframerate.cpp b/tools/qmldebugger/standalone/canvasframerate.cpp
index 63e04ed..d956029 100644
--- a/tools/qmldebugger/standalone/canvasframerate.cpp
+++ b/tools/qmldebugger/standalone/canvasframerate.cpp
@@ -43,6 +43,7 @@
 #include <QtCore/qdatastream.h>
 #include <QtCore/qmargins.h>
 
+#include <QtGui/qapplication.h>
 #include <QtGui/qpainter.h>
 #include <QtGui/qtooltip.h>
 #include <QtGui/qslider.h>
@@ -80,6 +81,7 @@ protected:
     virtual void paintEvent(QPaintEvent *);
     virtual void mouseMoveEvent(QMouseEvent *);
     virtual void leaveEvent(QEvent *);
+    virtual void wheelEvent(QWheelEvent *event);
 
 private slots:
     void sliderChanged(int);
@@ -109,7 +111,7 @@ private:
 
 QLineGraph::QLineGraph(QAbstractSlider *slider, QWidget *parent)
 : QWidget(parent), slider(slider), position(-1), samplesPerWidth(99), resolutionForHeight(50),
-  ignoreScroll(false), graphMargins(65, 10, 71, 40)
+  ignoreScroll(false), graphMargins(65, 10, 71, 35)
 {
     setMouseTracking(true);
 
@@ -129,7 +131,16 @@ void QLineGraph::sliderChanged(int v)
         position = -1;
     else
         position = v;
+    
     update();
+    
+    // update highlightedRect
+    QPoint pos = mapFromGlobal(QCursor::pos());
+    if (geometry().contains(pos)) {
+        QMouseEvent *me = new QMouseEvent(QEvent::MouseMove, pos,
+                Qt::NoButton, Qt::NoButton, Qt::NoModifier);
+        QApplication::postEvent(this, me);
+    }
 }
 
 void QLineGraph::clear()
@@ -153,7 +164,7 @@ void QLineGraph::updateSlider()
         slider->setValue(slider->maximum());
     } else {
         slider->setValue(position);
-    }
+    }    
     ignoreScroll = false;
 }
 
@@ -250,7 +261,7 @@ void QLineGraph::paintEvent(QPaintEvent *)
     p.save();
     p.rotate(-90);
     p.translate(-r.height()/2 - r.width()/2 - graphMargins.right(), -r.height()/2);
-    p.drawText(r, Qt::AlignCenter, tr("Time per frame (ms)"));
+    p.drawText(r, Qt::AlignCenter, tr("Frame rate"));
     p.restore();
 
     p.setBrush(QColor("lightsteelblue"));
@@ -310,11 +321,18 @@ void QLineGraph::mouseMoveEvent(QMouseEvent *event)
 void QLineGraph::leaveEvent(QEvent *)
 {
     if (!highlightedBar.isNull()) {
+        QRect bar = highlightedBar.adjusted(-1, -1, 1, 1);
         highlightedBar = QRect();
-        update(highlightedBar.adjusted(-1, -1, 1, 1));
+        update(bar);
     }
 }
 
+void QLineGraph::wheelEvent(QWheelEvent *event)
+{
+    QWheelEvent we(QPoint(0,0), event->delta(), event->buttons(), event->modifiers(), event->orientation());
+    QApplication::sendEvent(slider, &we);
+}
+
 void QLineGraph::setResolutionForHeight(int resolution)
 {
     resolutionForHeight = resolution;
@@ -337,6 +355,8 @@ class GraphWindow : public QWidget
 public:
     GraphWindow(QWidget *parent = 0);
 
+    virtual QSize sizeHint() const;
+
 public slots:
     void addSample(int, int, int, bool);
     void setResolutionForHeight(int);
@@ -357,13 +377,11 @@ GraphWindow::GraphWindow(QWidget *parent)
     setFocusProxy(scroll);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 5, 5);
+    layout->setContentsMargins(0, 0, 5, 0);
     layout->setSpacing(0);
     layout->addWidget(m_graph, 2);
     layout->addWidget(new QLabel(tr("Total time elapsed (ms)")), 0, Qt::AlignHCenter);
     layout->addWidget(scroll);
-
-    setMinimumSize(QSize(400, 200));
 }
 
 void GraphWindow::addSample(int a, int b, int d, bool isBreak)
@@ -381,6 +399,11 @@ void GraphWindow::clear()
     m_graph->clear();
 }
 
+QSize GraphWindow::sizeHint() const
+{
+    return QSize(400, 220);
+}
+    
 
 class CanvasFrameRatePlugin : public QmlDebugClient
 {
@@ -454,17 +477,15 @@ CanvasFrameRate::CanvasFrameRate(QWidget *parent)
 
     QVBoxLayout *groupLayout = new QVBoxLayout(m_group);
     groupLayout->setContentsMargins(5, 0, 5, 0);
-    groupLayout->setSpacing(5);
+    groupLayout->setSpacing(2);
     groupLayout->addWidget(m_tabs);
     groupLayout->addLayout(bottom);
     
     QVBoxLayout *layout = new QVBoxLayout;
-    layout->setContentsMargins(0, 15, 0, 0);
+    layout->setContentsMargins(0, 10, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_group);
     setLayout(layout);
-
-    setFocusPolicy(Qt::StrongFocus);
 }
 
 void CanvasFrameRate::reset(QmlDebugConnection *conn)
-- 
cgit v0.12


From 32c0739fa396829048c9a25d799adb4101a284e7 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 6 Nov 2009 11:59:21 +1000
Subject: visualtest webPageWidth

---
 .../visual/webview/zooming/data/pageWidth.qml      | 227 +++++++++++++++++++++
 .../visual/webview/zooming/pageWidth.qml           |   9 +
 2 files changed, 236 insertions(+)
 create mode 100644 tests/auto/declarative/visual/webview/zooming/data/pageWidth.qml
 create mode 100644 tests/auto/declarative/visual/webview/zooming/pageWidth.qml

diff --git a/tests/auto/declarative/visual/webview/zooming/data/pageWidth.qml b/tests/auto/declarative/visual/webview/zooming/data/pageWidth.qml
new file mode 100644
index 0000000..1a993e1
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/zooming/data/pageWidth.qml
@@ -0,0 +1,227 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 32
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 48
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 64
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 80
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 96
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 112
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 128
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 144
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 160
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 176
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 192
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 208
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 224
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 240
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 256
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 272
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 288
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 304
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 320
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 336
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 352
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 368
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 384
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 400
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 416
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 432
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 448
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 464
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 480
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 496
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 512
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 528
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 544
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 560
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 576
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 592
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 608
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 624
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 640
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 656
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 672
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 688
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 704
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 720
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 736
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 752
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 768
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 784
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 800
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 816
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 832
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 848
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 864
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+    Frame {
+        msec: 880
+        hash: "9a2554b1b322ea71115fa91d0100d2ff"
+    }
+}
diff --git a/tests/auto/declarative/visual/webview/zooming/pageWidth.qml b/tests/auto/declarative/visual/webview/zooming/pageWidth.qml
new file mode 100644
index 0000000..86dd7d2
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/zooming/pageWidth.qml
@@ -0,0 +1,9 @@
+import Qt 4.6
+
+WebView {
+    width: 200
+    height: 250
+    url: "resolution.html"
+    webPageWidth: 400
+    preferredWidth: 200
+}
-- 
cgit v0.12


From 1641e1845b51c83e95f613486a22a76d9e7f5948 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 6 Nov 2009 11:59:48 +1000
Subject: doc

---
 src/declarative/graphicsitems/qmlgraphicswebview.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index 5ce0ee8..7204767 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
@@ -464,7 +464,8 @@ void QmlGraphicsWebView::setPreferredWidth(int iw)
 
 /*!
     \qmlproperty int WebView::webPageWidth
-    This property holds the page width suggested to the web engine.
+    This property holds the page width suggested to the web engine. The zoomFactor
+    will be changed to fit this with in preferredWidth.
 */
 int QmlGraphicsWebView::webPageWidth() const
 {
-- 
cgit v0.12


From 3eb684e909efc9f38f60981a492e0bbd93bc5026 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 6 Nov 2009 12:59:04 +1000
Subject: more visual tests

---
 .../javascript/data/evaluateJavaScript.0.png       |  Bin 0 -> 7999 bytes
 .../javascript/data/evaluateJavaScript.1.png       |  Bin 0 -> 8020 bytes
 .../javascript/data/evaluateJavaScript.2.png       |  Bin 0 -> 8143 bytes
 .../javascript/data/evaluateJavaScript.3.png       |  Bin 0 -> 8158 bytes
 .../javascript/data/evaluateJavaScript.4.png       |  Bin 0 -> 8284 bytes
 .../javascript/data/evaluateJavaScript.5.png       |  Bin 0 -> 8284 bytes
 .../javascript/data/evaluateJavaScript.6.png       |  Bin 0 -> 8284 bytes
 .../javascript/data/evaluateJavaScript.7.png       |  Bin 0 -> 8284 bytes
 .../javascript/data/evaluateJavaScript.8.png       |  Bin 0 -> 8284 bytes
 .../webview/javascript/data/evaluateJavaScript.qml | 3759 ++++++++++++++++++++
 .../webview/javascript/evaluateJavaScript.qml      |   31 +
 .../webview/zooming/data/renderControl.0.png       |  Bin 0 -> 7589 bytes
 .../visual/webview/zooming/data/renderControl.qml  |  415 +++
 .../visual/webview/zooming/renderControl.qml       |   21 +
 14 files changed, 4226 insertions(+)
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.0.png
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.1.png
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.2.png
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.3.png
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.4.png
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.5.png
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.6.png
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.7.png
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.8.png
 create mode 100644 tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.qml
 create mode 100644 tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml
 create mode 100644 tests/auto/declarative/visual/webview/zooming/data/renderControl.0.png
 create mode 100644 tests/auto/declarative/visual/webview/zooming/data/renderControl.qml
 create mode 100644 tests/auto/declarative/visual/webview/zooming/renderControl.qml

diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.0.png b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.0.png
new file mode 100644
index 0000000..139aa9d
Binary files /dev/null and b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.0.png differ
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.1.png b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.1.png
new file mode 100644
index 0000000..e2e1644
Binary files /dev/null and b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.1.png differ
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.2.png b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.2.png
new file mode 100644
index 0000000..aa2fb82
Binary files /dev/null and b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.2.png differ
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.3.png b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.3.png
new file mode 100644
index 0000000..1976430
Binary files /dev/null and b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.3.png differ
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.4.png b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.4.png
new file mode 100644
index 0000000..c895a0a
Binary files /dev/null and b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.4.png differ
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.5.png b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.5.png
new file mode 100644
index 0000000..c895a0a
Binary files /dev/null and b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.5.png differ
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.6.png b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.6.png
new file mode 100644
index 0000000..c895a0a
Binary files /dev/null and b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.6.png differ
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.7.png b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.7.png
new file mode 100644
index 0000000..c895a0a
Binary files /dev/null and b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.7.png differ
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.8.png b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.8.png
new file mode 100644
index 0000000..c895a0a
Binary files /dev/null and b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.8.png differ
diff --git a/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.qml b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.qml
new file mode 100644
index 0000000..957f9d5
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/javascript/data/evaluateJavaScript.qml
@@ -0,0 +1,3759 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 32
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 48
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 64
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 80
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 96
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 112
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 128
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 144
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 160
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 176
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 192
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 208
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 224
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 240
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 256
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 272
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 288
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 304
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 320
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 336
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 352
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 368
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 384
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 400
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 416
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 195; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 187; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 432
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 153; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 448
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 145; y: 87
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 139; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 464
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 135; y: 111
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 129; y: 121
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 480
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 125; y: 131
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 121; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 117; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 496
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 111; y: 157
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 512
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 107; y: 165
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 101; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 528
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 97; y: 177
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 185
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 544
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 91; y: 189
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 89; y: 195
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 560
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 85; y: 199
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 84; y: 201
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 576
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 83; y: 203
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 81; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 592
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 80; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 608
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 79; y: 205
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 78; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 624
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 77; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 76; y: 208
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 75; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 640
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 71; y: 216
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 656
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 218
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 220
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 672
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 69; y: 222
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 68; y: 224
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 688
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 225
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 704
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 720
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 736
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 752
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 768
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 784
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 225
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 800
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 66; y: 224
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 816
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 66; y: 222
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 832
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 221
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 61; y: 217
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 848
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 60; y: 215
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 864
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 59; y: 214
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 880
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 55; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 896
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 912
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 928
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 944
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 960
+        image: "evaluateJavaScript.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 992
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1008
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 55; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1024
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1040
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1056
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1072
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1088
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 55; y: 213
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1104
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1120
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1136
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1152
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1168
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1184
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1200
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1216
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1232
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1248
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1264
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1280
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1296
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 212
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1312
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 210
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 67; y: 209
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1328
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 69; y: 208
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 71; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1344
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 73; y: 207
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 75; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1360
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1376
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1392
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1408
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1424
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1440
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1456
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1472
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1488
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1504
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1520
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1536
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1552
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1568
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1584
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1600
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1616
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1632
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1648
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1664
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1680
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Frame {
+        msec: 1696
+        hash: "f35c69aed43a795ff02b46d7b01ef64a"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1712
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1728
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1744
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1760
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1776
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1792
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1808
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1824
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1840
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1856
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1872
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1888
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1904
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1920
+        image: "evaluateJavaScript.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1952
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Frame {
+        msec: 1968
+        hash: "244200622435603a75f58366496daf8b"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 1984
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2000
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2016
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2032
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2048
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2064
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2080
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2096
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2112
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2128
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2144
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2160
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2176
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Frame {
+        msec: 2192
+        hash: "44dc10a2914a391b57e68c2002a95adf"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2208
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2224
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2240
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2256
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2272
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2288
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2304
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2320
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2336
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2352
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2368
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2384
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2400
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Frame {
+        msec: 2416
+        hash: "c93921d0611e95373338c14cfcc17481"
+    }
+    Key {
+        type: 6
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2432
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2448
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2464
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2480
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Key {
+        type: 7
+        key: 83
+        modifiers: 0
+        text: "73"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 2496
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2512
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2528
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2544
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2560
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2576
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2592
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2608
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2624
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2640
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2656
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2672
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2688
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2704
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2720
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2736
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2752
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2768
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2784
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2800
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2816
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2832
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2848
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2864
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2880
+        image: "evaluateJavaScript.2.png"
+    }
+    Frame {
+        msec: 2896
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2912
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2928
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2944
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2960
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2976
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 2992
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3008
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3024
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3040
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3056
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3072
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3088
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3104
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3120
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3136
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3152
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3168
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3184
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3200
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3216
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3232
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3248
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3264
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3280
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3296
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3312
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 74; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3328
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 72; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3344
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 70; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 68; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3360
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 63; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3376
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 61; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 59; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3392
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 57; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 55; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3408
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 54; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 53; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3424
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3440
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3456
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3472
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3488
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3504
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Frame {
+        msec: 3520
+        hash: "9266775c7f2156977ff56fcd45246229"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 52; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 52; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3536
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3552
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3568
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3584
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3600
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3616
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3632
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3648
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 52; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3664
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3680
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3696
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3712
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3728
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3744
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3760
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3776
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3792
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3808
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3824
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3840
+        image: "evaluateJavaScript.3.png"
+    }
+    Frame {
+        msec: 3856
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3872
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3888
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3904
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3920
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3936
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3952
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3968
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Frame {
+        msec: 3984
+        hash: "b62d9027299daa6ab8304d812ed00f83"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4000
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4016
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4032
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4048
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4064
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4080
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4096
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4112
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4128
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4144
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4160
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4176
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4192
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4208
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4224
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4240
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4256
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4272
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4288
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4304
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4320
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4336
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4352
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4368
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4384
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4400
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4416
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4432
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4448
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4464
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4480
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4496
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4512
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4528
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4544
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4560
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4576
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4592
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4608
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4624
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4640
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4656
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4672
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4688
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4704
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4720
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4736
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4752
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4768
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Frame {
+        msec: 4784
+        hash: "6cea5b700e402072a9953c81b605ef22"
+    }
+    Key {
+        type: 6
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4800
+        image: "evaluateJavaScript.4.png"
+    }
+    Frame {
+        msec: 4816
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4832
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4848
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4864
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4880
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4896
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4912
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4928
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Key {
+        type: 7
+        key: 65
+        modifiers: 0
+        text: "61"
+        autorep: false
+        count: 1
+    }
+    Frame {
+        msec: 4944
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4960
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4976
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 4992
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5008
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5024
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5040
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5056
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5072
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5088
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5104
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5120
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5136
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5152
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5168
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5184
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5200
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5216
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5232
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5248
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5264
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5280
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5296
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5312
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5328
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5344
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5360
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5376
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5392
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5408
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5424
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5440
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5456
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5472
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5488
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5504
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5520
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5536
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5552
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5568
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5584
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5600
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5616
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5632
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5648
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5664
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5680
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5696
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5712
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5728
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5744
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5760
+        image: "evaluateJavaScript.5.png"
+    }
+    Frame {
+        msec: 5776
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5792
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5808
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 5824
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 54; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5840
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 56; y: 206
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 62; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 65; y: 204
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 71; y: 202
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 79; y: 200
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5872
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 82; y: 200
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 90; y: 196
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5888
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 192
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 102; y: 188
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5904
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 108; y: 182
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 112; y: 176
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5920
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 116; y: 168
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 120; y: 158
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5936
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 124; y: 148
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 128; y: 136
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5952
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 130; y: 124
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 134; y: 112
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5968
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 138; y: 100
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 142; y: 88
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5984
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 78
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6000
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 150; y: 68
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 154; y: 62
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 158; y: 56
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6016
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 162; y: 48
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6032
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 166; y: 44
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 168; y: 38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 172; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6048
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 174; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 176; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6064
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 177; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6080
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 16
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 14
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6096
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6112
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6128
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6144
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 179; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6160
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 180; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6176
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 181; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 181; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6192
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 182; y: 2
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 183; y: 1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6208
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6224
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6240
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6256
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6272
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6288
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6304
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6320
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6336
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6352
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6368
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6384
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6400
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6416
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6432
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6448
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6464
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6480
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6496
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6512
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6528
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6544
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6560
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6576
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6592
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6608
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6624
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6640
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6656
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6672
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6688
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6704
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6720
+        image: "evaluateJavaScript.6.png"
+    }
+    Frame {
+        msec: 6736
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6752
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6768
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6784
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6800
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6816
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6832
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6848
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6864
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 176; y: 1
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 174; y: 15
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 172; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6880
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 166; y: 47
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 162; y: 63
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6896
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 156; y: 81
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 150; y: 95
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6912
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 144; y: 107
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 138; y: 119
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6928
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 132; y: 127
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 126; y: 133
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6944
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 122; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 120; y: 138
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6960
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 120; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 6976
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 6992
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7008
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7024
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7040
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7056
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7072
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 119; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7088
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7104
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7120
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 117; y: 137
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7136
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 116; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 115; y: 141
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7152
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 113; y: 149
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 109; y: 155
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7168
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 107; y: 165
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 103; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7184
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 179
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 98; y: 181
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7200
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 187
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 189
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7216
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 95; y: 190
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7232
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7248
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7264
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7280
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 188
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7296
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 187
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 186
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7312
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 96; y: 185
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 97; y: 184
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7328
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 97; y: 183
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 97; y: 182
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7344
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 98; y: 180
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7360
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 98; y: 178
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7376
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 177
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 176
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 99; y: 174
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7392
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7408
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 100; y: 172
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 100; y: 171
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7424
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 100; y: 170
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7440
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 100; y: 169
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7456
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 101; y: 167
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7472
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7488
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7504
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 101; y: 167
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7520
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7536
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7552
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7568
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7584
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7600
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7616
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Frame {
+        msec: 7632
+        hash: "04e2e16813a9cafc37077a675e279f5f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 101; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7648
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7664
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7680
+        image: "evaluateJavaScript.7.png"
+    }
+    Frame {
+        msec: 7696
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7712
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7728
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7744
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7760
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7776
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7792
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7808
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7824
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 103; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7840
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 7856
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 105; y: 166
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7872
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 106; y: 165
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 107; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7888
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 108; y: 164
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 109; y: 163
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7904
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 111; y: 163
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 112; y: 162
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7920
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 116; y: 158
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7936
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 118; y: 157
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 122; y: 153
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7952
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 128; y: 147
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 134; y: 139
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7968
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 140; y: 133
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 146; y: 125
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 150; y: 117
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 7984
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 156; y: 109
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 160; y: 99
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8000
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 164; y: 89
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 166; y: 77
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8016
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 170; y: 67
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 172; y: 55
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8032
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 176; y: 45
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8048
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 178; y: 27
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 180; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8064
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 180; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 0
+        x: 182; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 8080
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8096
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8112
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8128
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8144
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8160
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8176
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8192
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8208
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8224
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8240
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8256
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8272
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8288
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8304
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8320
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8336
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8352
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8368
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8384
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8400
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8416
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8432
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8448
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8464
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8480
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8496
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8512
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8528
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8544
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8560
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8576
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8592
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8608
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8624
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8640
+        image: "evaluateJavaScript.8.png"
+    }
+    Frame {
+        msec: 8656
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+    Frame {
+        msec: 8672
+        hash: "792140067e09d04b31e78be1fc9a40a2"
+    }
+}
diff --git a/tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml b/tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml
new file mode 100644
index 0000000..d3cf578
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/javascript/evaluateJavaScript.qml
@@ -0,0 +1,31 @@
+import Qt 4.6
+
+Column {
+    WebView {
+        id: webview
+        width: 200
+        height: 200
+        url: "test-objects.html"
+        javaScriptWindowObjects:
+            Object {
+                property string text: btntext.text
+                WebView.windowObjectName: "qmltext"
+                onTextChanged: {
+                    webview.evaluateJavaScript("{document.getElementById('button').value=window.qmltext.text}")
+                }
+            }
+    }
+    Row {
+        Text { text: "Input:" }
+        Rectangle {
+            width: btntext.width+10
+            height: btntext.height+10
+            border.color: "black"
+            TextInput {
+                id: btntext
+                text: "Blah"
+                cursorDelegate: Rectangle { width: 1; color: "red" }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/webview/zooming/data/renderControl.0.png b/tests/auto/declarative/visual/webview/zooming/data/renderControl.0.png
new file mode 100644
index 0000000..38df70e
Binary files /dev/null and b/tests/auto/declarative/visual/webview/zooming/data/renderControl.0.png differ
diff --git a/tests/auto/declarative/visual/webview/zooming/data/renderControl.qml b/tests/auto/declarative/visual/webview/zooming/data/renderControl.qml
new file mode 100644
index 0000000..d3c5890
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/zooming/data/renderControl.qml
@@ -0,0 +1,415 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "4f999826cd5ebe4f58bfd255e1c22be0"
+    }
+    Frame {
+        msec: 32
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+    Frame {
+        msec: 48
+        hash: "19d5f48f1c73d52483be96c887d3fd76"
+    }
+    Frame {
+        msec: 64
+        hash: "9b85eef4e0746cc43aaefd442efdd824"
+    }
+    Frame {
+        msec: 80
+        hash: "fca0034fb720e40198ede95a0ab0fadb"
+    }
+    Frame {
+        msec: 96
+        hash: "9f63ddbd927a4b08242f3410a9ed7283"
+    }
+    Frame {
+        msec: 112
+        hash: "4f5804c3c3ee195470a462293307cfd5"
+    }
+    Frame {
+        msec: 128
+        hash: "d0434f08a8097b97b76c1194317a38ba"
+    }
+    Frame {
+        msec: 144
+        hash: "921880d300e56f9605923a13fcd8b967"
+    }
+    Frame {
+        msec: 160
+        hash: "f5dc87abf36332c68fd4450a6236dcb4"
+    }
+    Frame {
+        msec: 176
+        hash: "c54f220cd5768afa1c12579007e17eff"
+    }
+    Frame {
+        msec: 192
+        hash: "e1c70c3896d5a937296f205b09991b31"
+    }
+    Frame {
+        msec: 208
+        hash: "d135f70f761add1358062a0386c62d18"
+    }
+    Frame {
+        msec: 224
+        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
+    }
+    Frame {
+        msec: 240
+        hash: "2ff4feb61d958a800b38b282c3400293"
+    }
+    Frame {
+        msec: 256
+        hash: "59f5585ec472efa29c5eba8b972ab3bd"
+    }
+    Frame {
+        msec: 272
+        hash: "3aef5e1ff6da15e0e9f2e620dbabbab2"
+    }
+    Frame {
+        msec: 288
+        hash: "2931299f667752efe9fca727534385e1"
+    }
+    Frame {
+        msec: 304
+        hash: "2ed90e61c41b994ccea924191b66fc71"
+    }
+    Frame {
+        msec: 320
+        hash: "1424c634067c896973c2c10793957933"
+    }
+    Frame {
+        msec: 336
+        hash: "c4d30d511053a7caeefdae753236cf5b"
+    }
+    Frame {
+        msec: 352
+        hash: "32300e07e34e8f316770c790a5ef9f6d"
+    }
+    Frame {
+        msec: 368
+        hash: "95312dc2a4d88a48605fea170712354d"
+    }
+    Frame {
+        msec: 384
+        hash: "3d146357d1532640cefb64fbae75bc0d"
+    }
+    Frame {
+        msec: 400
+        hash: "5b78740511a456a3647d8392b2008f7f"
+    }
+    Frame {
+        msec: 416
+        hash: "dddb065cefa27a862d108429c9984191"
+    }
+    Frame {
+        msec: 432
+        hash: "0857067a0ee381e0f462ef8aceb0b696"
+    }
+    Frame {
+        msec: 448
+        hash: "1f5e7e064cc62ff2e0585c98875351df"
+    }
+    Frame {
+        msec: 464
+        hash: "c7f6bb852bdb2b99cbb5a8ca34f1585a"
+    }
+    Frame {
+        msec: 480
+        hash: "f2284dea5812f167cae08c687fc1a3e9"
+    }
+    Frame {
+        msec: 496
+        hash: "deec54bc32c46921e5032bce7daa1dad"
+    }
+    Frame {
+        msec: 512
+        hash: "1271d3704de17bfe463c76fd73c3132b"
+    }
+    Frame {
+        msec: 528
+        hash: "0568b0ecd47cd1c34b9de477e68e5751"
+    }
+    Frame {
+        msec: 544
+        hash: "f070dd88e42697a9e43573f9f41b3540"
+    }
+    Frame {
+        msec: 560
+        hash: "f5ced2827b06ea514f05866f1e4099f0"
+    }
+    Frame {
+        msec: 576
+        hash: "59f5585ec472efa29c5eba8b972ab3bd"
+    }
+    Frame {
+        msec: 592
+        hash: "2ff4feb61d958a800b38b282c3400293"
+    }
+    Frame {
+        msec: 608
+        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
+    }
+    Frame {
+        msec: 624
+        hash: "d135f70f761add1358062a0386c62d18"
+    }
+    Frame {
+        msec: 640
+        hash: "e1c70c3896d5a937296f205b09991b31"
+    }
+    Frame {
+        msec: 656
+        hash: "c54f220cd5768afa1c12579007e17eff"
+    }
+    Frame {
+        msec: 672
+        hash: "f5dc87abf36332c68fd4450a6236dcb4"
+    }
+    Frame {
+        msec: 688
+        hash: "921880d300e56f9605923a13fcd8b967"
+    }
+    Frame {
+        msec: 704
+        hash: "d0434f08a8097b97b76c1194317a38ba"
+    }
+    Frame {
+        msec: 720
+        hash: "4f5804c3c3ee195470a462293307cfd5"
+    }
+    Frame {
+        msec: 736
+        hash: "9f63ddbd927a4b08242f3410a9ed7283"
+    }
+    Frame {
+        msec: 752
+        hash: "fca0034fb720e40198ede95a0ab0fadb"
+    }
+    Frame {
+        msec: 768
+        hash: "9b85eef4e0746cc43aaefd442efdd824"
+    }
+    Frame {
+        msec: 784
+        hash: "19d5f48f1c73d52483be96c887d3fd76"
+    }
+    Frame {
+        msec: 800
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+    Frame {
+        msec: 816
+        hash: "4f999826cd5ebe4f58bfd255e1c22be0"
+    }
+    Frame {
+        msec: 832
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+    Frame {
+        msec: 848
+        hash: "19d5f48f1c73d52483be96c887d3fd76"
+    }
+    Frame {
+        msec: 864
+        hash: "9b85eef4e0746cc43aaefd442efdd824"
+    }
+    Frame {
+        msec: 880
+        hash: "fca0034fb720e40198ede95a0ab0fadb"
+    }
+    Frame {
+        msec: 896
+        hash: "9f63ddbd927a4b08242f3410a9ed7283"
+    }
+    Frame {
+        msec: 912
+        hash: "4f5804c3c3ee195470a462293307cfd5"
+    }
+    Frame {
+        msec: 928
+        hash: "d0434f08a8097b97b76c1194317a38ba"
+    }
+    Frame {
+        msec: 944
+        hash: "921880d300e56f9605923a13fcd8b967"
+    }
+    Frame {
+        msec: 960
+        image: "renderControl.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "c54f220cd5768afa1c12579007e17eff"
+    }
+    Frame {
+        msec: 992
+        hash: "e1c70c3896d5a937296f205b09991b31"
+    }
+    Frame {
+        msec: 1008
+        hash: "d135f70f761add1358062a0386c62d18"
+    }
+    Frame {
+        msec: 1024
+        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
+    }
+    Frame {
+        msec: 1040
+        hash: "2ff4feb61d958a800b38b282c3400293"
+    }
+    Frame {
+        msec: 1056
+        hash: "59f5585ec472efa29c5eba8b972ab3bd"
+    }
+    Frame {
+        msec: 1072
+        hash: "3aef5e1ff6da15e0e9f2e620dbabbab2"
+    }
+    Frame {
+        msec: 1088
+        hash: "2931299f667752efe9fca727534385e1"
+    }
+    Frame {
+        msec: 1104
+        hash: "2ed90e61c41b994ccea924191b66fc71"
+    }
+    Frame {
+        msec: 1120
+        hash: "1424c634067c896973c2c10793957933"
+    }
+    Frame {
+        msec: 1136
+        hash: "c4d30d511053a7caeefdae753236cf5b"
+    }
+    Frame {
+        msec: 1152
+        hash: "32300e07e34e8f316770c790a5ef9f6d"
+    }
+    Frame {
+        msec: 1168
+        hash: "95312dc2a4d88a48605fea170712354d"
+    }
+    Frame {
+        msec: 1184
+        hash: "3d146357d1532640cefb64fbae75bc0d"
+    }
+    Frame {
+        msec: 1200
+        hash: "5b78740511a456a3647d8392b2008f7f"
+    }
+    Frame {
+        msec: 1216
+        hash: "dddb065cefa27a862d108429c9984191"
+    }
+    Frame {
+        msec: 1232
+        hash: "0857067a0ee381e0f462ef8aceb0b696"
+    }
+    Frame {
+        msec: 1248
+        hash: "1f5e7e064cc62ff2e0585c98875351df"
+    }
+    Frame {
+        msec: 1264
+        hash: "c7f6bb852bdb2b99cbb5a8ca34f1585a"
+    }
+    Frame {
+        msec: 1280
+        hash: "f2284dea5812f167cae08c687fc1a3e9"
+    }
+    Frame {
+        msec: 1296
+        hash: "deec54bc32c46921e5032bce7daa1dad"
+    }
+    Frame {
+        msec: 1312
+        hash: "1271d3704de17bfe463c76fd73c3132b"
+    }
+    Frame {
+        msec: 1328
+        hash: "0568b0ecd47cd1c34b9de477e68e5751"
+    }
+    Frame {
+        msec: 1344
+        hash: "f070dd88e42697a9e43573f9f41b3540"
+    }
+    Frame {
+        msec: 1360
+        hash: "f5ced2827b06ea514f05866f1e4099f0"
+    }
+    Frame {
+        msec: 1376
+        hash: "59f5585ec472efa29c5eba8b972ab3bd"
+    }
+    Frame {
+        msec: 1392
+        hash: "2ff4feb61d958a800b38b282c3400293"
+    }
+    Frame {
+        msec: 1408
+        hash: "53cb2ed2b65e77cf0cd70530f32854ad"
+    }
+    Frame {
+        msec: 1424
+        hash: "d135f70f761add1358062a0386c62d18"
+    }
+    Frame {
+        msec: 1440
+        hash: "e1c70c3896d5a937296f205b09991b31"
+    }
+    Frame {
+        msec: 1456
+        hash: "c54f220cd5768afa1c12579007e17eff"
+    }
+    Frame {
+        msec: 1472
+        hash: "f5dc87abf36332c68fd4450a6236dcb4"
+    }
+    Frame {
+        msec: 1488
+        hash: "921880d300e56f9605923a13fcd8b967"
+    }
+    Frame {
+        msec: 1504
+        hash: "d0434f08a8097b97b76c1194317a38ba"
+    }
+    Frame {
+        msec: 1520
+        hash: "4f5804c3c3ee195470a462293307cfd5"
+    }
+    Frame {
+        msec: 1536
+        hash: "9f63ddbd927a4b08242f3410a9ed7283"
+    }
+    Frame {
+        msec: 1552
+        hash: "fca0034fb720e40198ede95a0ab0fadb"
+    }
+    Frame {
+        msec: 1568
+        hash: "9b85eef4e0746cc43aaefd442efdd824"
+    }
+    Frame {
+        msec: 1584
+        hash: "19d5f48f1c73d52483be96c887d3fd76"
+    }
+    Frame {
+        msec: 1600
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+    Frame {
+        msec: 1616
+        hash: "4f999826cd5ebe4f58bfd255e1c22be0"
+    }
+    Frame {
+        msec: 1632
+        hash: "3aa9bd1bd75219f82578689ac6d81c7e"
+    }
+}
diff --git a/tests/auto/declarative/visual/webview/zooming/renderControl.qml b/tests/auto/declarative/visual/webview/zooming/renderControl.qml
new file mode 100644
index 0000000..c2f2c02
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/zooming/renderControl.qml
@@ -0,0 +1,21 @@
+import Qt 4.6
+
+Rectangle {
+    width: 200
+    height: 250
+    clip: true
+    WebView {
+        id: webview
+        width: 400
+        url: "renderControl.html"
+        x: SequentialAnimation {
+                running: true
+                repeat: true
+                NumberAnimation { from: 100; to: 0; duration: 200 }
+                PropertyAction { target: webview; property: "renderingEnabled"; value: false }
+                NumberAnimation { from: 0; to: -100; duration: 200 }
+                PropertyAction { target: webview; property: "renderingEnabled"; value: true }
+                NumberAnimation { from: -100; to: 100; duration: 400 }
+            }
+    }
+}
-- 
cgit v0.12


From cefc5817a9c39475e55f02922125a66b2a4d515e Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 6 Nov 2009 12:59:30 +1000
Subject: basic pixelcache test

---
 tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
index 864f4b5..e7e9204 100644
--- a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
+++ b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
@@ -147,6 +147,11 @@ void tst_qmlgraphicswebview::basicProperties()
     QVERIFY(!wv->forwardAction()->isEnabled());
     QVERIFY(wv->stopAction());
     QVERIFY(!wv->stopAction()->isEnabled());
+
+    wv->setPixelCacheSize(0); // mainly testing that it doesn't crash or anything!
+    QCOMPARE(wv->pixelCacheSize(),0);
+    wv->reloadAction()->trigger();
+    QTRY_COMPARE(wv->progress(), 1.0);
 }
 
 void tst_qmlgraphicswebview::historyNav()
-- 
cgit v0.12


From 4d285231be1b4404e6161c9b5db4fba413bd44e5 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 6 Nov 2009 13:10:16 +1000
Subject: Remove textSizeMultiplier - it's broken and obsolete in QtWebKit.

---
 src/declarative/graphicsitems/qmlgraphicswebview.cpp | 14 --------------
 src/declarative/graphicsitems/qmlgraphicswebview_p.h |  4 ----
 2 files changed, 18 deletions(-)

diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
index 7204767..214117f 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp
@@ -907,20 +907,6 @@ QPixmap QmlGraphicsWebView::icon() const
 
 
 /*!
-    \qmlproperty real WebView::textSizeMultiplier
-    This property holds the multiplier used to scale the text in a Web page
-*/
-void QmlGraphicsWebView::setTextSizeMultiplier(qreal factor)
-{
-    page()->mainFrame()->setTextSizeMultiplier(factor);
-}
-
-qreal QmlGraphicsWebView::textSizeMultiplier() const
-{
-    return page()->mainFrame()->textSizeMultiplier();
-}
-
-/*!
     \qmlproperty real WebView::zoomFactor
     This property holds the multiplier used to scale the contents of a Web page.
 */
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview_p.h b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
index 6852bb0..d574c59 100644
--- a/src/declarative/graphicsitems/qmlgraphicswebview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicswebview_p.h
@@ -88,7 +88,6 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsWebView : public QmlGraphicsPaintedItem
 
     Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QPixmap icon READ icon NOTIFY iconChanged)
-    Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
     Q_PROPERTY(QString statusText READ statusText NOTIFY statusTextChanged)
 
@@ -126,9 +125,6 @@ public:
 
     QPixmap icon() const;
 
-    qreal textSizeMultiplier() const;
-    void setTextSizeMultiplier(qreal);
-
     qreal zoomFactor() const;
     void setZoomFactor(qreal);
 
-- 
cgit v0.12


From 178ac95dcad8620003704dc12ff462df0df9c89e Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 6 Nov 2009 13:23:51 +1000
Subject: test text-only zooming.

---
 .../visual/webview/zooming/data/zoomTextOnly.0.png | Bin 0 -> 5589 bytes
 .../visual/webview/zooming/data/zoomTextOnly.1.png | Bin 0 -> 6848 bytes
 .../visual/webview/zooming/data/zoomTextOnly.qml   | 655 +++++++++++++++++++++
 .../visual/webview/zooming/zoomTextOnly.html       |   7 +
 .../visual/webview/zooming/zoomTextOnly.qml        |  15 +
 5 files changed, 677 insertions(+)
 create mode 100644 tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.0.png
 create mode 100644 tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.1.png
 create mode 100644 tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.qml
 create mode 100644 tests/auto/declarative/visual/webview/zooming/zoomTextOnly.html
 create mode 100644 tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml

diff --git a/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.0.png b/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.0.png
new file mode 100644
index 0000000..4b9abb4
Binary files /dev/null and b/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.0.png differ
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.1.png b/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.1.png
new file mode 100644
index 0000000..5ce9787
Binary files /dev/null and b/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.1.png differ
diff --git a/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.qml b/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.qml
new file mode 100644
index 0000000..aaa7583
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/zooming/data/zoomTextOnly.qml
@@ -0,0 +1,655 @@
+import Qt.VisualTest 4.6
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        hash: "4e401b5ebff6e442fa108e94a5dba668"
+    }
+    Frame {
+        msec: 32
+        hash: "c2f8551d0442d0736b71c54fc965562b"
+    }
+    Frame {
+        msec: 48
+        hash: "4fc1ef611b24ec5737310859b12c83d3"
+    }
+    Frame {
+        msec: 64
+        hash: "7df07aea83bc5c3213e7871854661820"
+    }
+    Frame {
+        msec: 80
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 96
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 112
+        hash: "f5c917c7ca26bb916dd4df84eafc8e94"
+    }
+    Frame {
+        msec: 128
+        hash: "0696257de0441666bd264f8db6383d15"
+    }
+    Frame {
+        msec: 144
+        hash: "0b43fdee23346c30c60b822a20131cc3"
+    }
+    Frame {
+        msec: 160
+        hash: "98dbd004cf4809dbc90bfa9272378644"
+    }
+    Frame {
+        msec: 176
+        hash: "32d0e9005ebb9dfd410d348e336bcd93"
+    }
+    Frame {
+        msec: 192
+        hash: "8a64b18006ad0bd2c373a2a9395ce52e"
+    }
+    Frame {
+        msec: 208
+        hash: "7dc26fd658f626b8fe18545cf93dc4ec"
+    }
+    Frame {
+        msec: 224
+        hash: "6712be93cf1ed2b7b202367418b6d2d7"
+    }
+    Frame {
+        msec: 240
+        hash: "524840a3453af4e97ac82b559308cce3"
+    }
+    Frame {
+        msec: 256
+        hash: "11436091b24c02af94dfa75a5fd1a001"
+    }
+    Frame {
+        msec: 272
+        hash: "d3689b53474b4b26630d70ba01c057b4"
+    }
+    Frame {
+        msec: 288
+        hash: "16e2b66f28ed80d80d9b5264d89624d5"
+    }
+    Frame {
+        msec: 304
+        hash: "87636076959de7e5a0a8bd8b31354ed4"
+    }
+    Frame {
+        msec: 320
+        hash: "a6916da6bfac27aa87d75da2bbb73f31"
+    }
+    Frame {
+        msec: 336
+        hash: "58cfba3aae4bf54a5b445e0e34571d2d"
+    }
+    Frame {
+        msec: 352
+        hash: "1475ae722afd169cc0c8e1fde39eb6b7"
+    }
+    Frame {
+        msec: 368
+        hash: "14d08c2ca430631af8ede1013f4f4da0"
+    }
+    Frame {
+        msec: 384
+        hash: "ace9db9112d147569dc0cf1a1b680d6c"
+    }
+    Frame {
+        msec: 400
+        hash: "08bc6815601417f3731eaae398d0861d"
+    }
+    Frame {
+        msec: 416
+        hash: "809870dfd9b05ce07170edd945348ddf"
+    }
+    Frame {
+        msec: 432
+        hash: "5784deb0f3270cf7a0d0964cd9d31458"
+    }
+    Frame {
+        msec: 448
+        hash: "2f06ee407e5175d4b954e31c39c9522c"
+    }
+    Frame {
+        msec: 464
+        hash: "48a7dbed293fbbd5ea202190837a411f"
+    }
+    Frame {
+        msec: 480
+        hash: "abf3d90803cfa12d35d2752be7ea02d8"
+    }
+    Frame {
+        msec: 496
+        hash: "a60edcf8d792f93a839e6ddbafbf993f"
+    }
+    Frame {
+        msec: 512
+        hash: "7e8dfe86ea0849022355b12578d4cb1a"
+    }
+    Frame {
+        msec: 528
+        hash: "3c84122b0933ee870f178d39469e51e2"
+    }
+    Frame {
+        msec: 544
+        hash: "25f463e91febf5b6d8819fd5010bc1c2"
+    }
+    Frame {
+        msec: 560
+        hash: "d423a9bc912237d0f20b924849ba0cb1"
+    }
+    Frame {
+        msec: 576
+        hash: "5bd3cc309a5fce6183654975543250b2"
+    }
+    Frame {
+        msec: 592
+        hash: "4e401b5ebff6e442fa108e94a5dba668"
+    }
+    Frame {
+        msec: 608
+        hash: "9a4bf1400da038f2088dd4c49403d852"
+    }
+    Frame {
+        msec: 624
+        hash: "a37024356613bd5d678e0b2f7b8f5959"
+    }
+    Frame {
+        msec: 640
+        hash: "4f37d72c10e51f68a2359086094da249"
+    }
+    Frame {
+        msec: 656
+        hash: "6093bcb7673f8e58fe5a7b0143638822"
+    }
+    Frame {
+        msec: 672
+        hash: "c272aeea2b9c450fbd732305ccc01b93"
+    }
+    Frame {
+        msec: 688
+        hash: "6a4e2ee45b26037421e2a5f2d6ee517e"
+    }
+    Frame {
+        msec: 704
+        hash: "d912afcbce6c9d879a07ffc3c51b36d1"
+    }
+    Frame {
+        msec: 720
+        hash: "2578335ac6f21c8aec2c87515562c321"
+    }
+    Frame {
+        msec: 736
+        hash: "5b77af55f0a723ba762d283f41e91c98"
+    }
+    Frame {
+        msec: 752
+        hash: "b420fc71b22fa608a9c0cdbbbc61c447"
+    }
+    Frame {
+        msec: 768
+        hash: "3f7a9cecf2a590e8728137fabfd3f5f3"
+    }
+    Frame {
+        msec: 784
+        hash: "c51f12a2f438f137785c70e3af4922fd"
+    }
+    Frame {
+        msec: 800
+        hash: "5d97175fc4d986e5b21758d4ac785025"
+    }
+    Frame {
+        msec: 816
+        hash: "94f922f3460ad76cd05cb5b321977a94"
+    }
+    Frame {
+        msec: 832
+        hash: "5747adbc4f0b22ed359793d72d3e7d1f"
+    }
+    Frame {
+        msec: 848
+        hash: "255d1d45d3343972f156dfab7d13ce41"
+    }
+    Frame {
+        msec: 864
+        hash: "e5b54132ffb83acad30622e969405bc0"
+    }
+    Frame {
+        msec: 880
+        hash: "2c05cf00e3417883e789f58c2728dc97"
+    }
+    Frame {
+        msec: 896
+        hash: "9d66290b1aae1de3025d24d3efc4ca1c"
+    }
+    Frame {
+        msec: 912
+        hash: "5e9b0783b1b4221145a4febbae56b30f"
+    }
+    Frame {
+        msec: 928
+        hash: "21eea497c26600b03d868661232b3ebe"
+    }
+    Frame {
+        msec: 944
+        hash: "2383c415170ac6444f1c193ed698f682"
+    }
+    Frame {
+        msec: 960
+        image: "zoomTextOnly.0.png"
+    }
+    Frame {
+        msec: 976
+        hash: "4ed0f85dec4eb0bb740ac3780b6872c0"
+    }
+    Frame {
+        msec: 992
+        hash: "0a18bccca4efeadfced8e5cb1715a1f3"
+    }
+    Frame {
+        msec: 1008
+        hash: "823e65df9075eb0e9a3aad6b15ec3342"
+    }
+    Frame {
+        msec: 1024
+        hash: "823e65df9075eb0e9a3aad6b15ec3342"
+    }
+    Frame {
+        msec: 1040
+        hash: "0a18bccca4efeadfced8e5cb1715a1f3"
+    }
+    Frame {
+        msec: 1056
+        hash: "4ed0f85dec4eb0bb740ac3780b6872c0"
+    }
+    Frame {
+        msec: 1072
+        hash: "fae77663566351fa3bb506b459496a9d"
+    }
+    Frame {
+        msec: 1088
+        hash: "2383c415170ac6444f1c193ed698f682"
+    }
+    Frame {
+        msec: 1104
+        hash: "2e05365256bebbdf3229f99b94263b6c"
+    }
+    Frame {
+        msec: 1120
+        hash: "5e9b0783b1b4221145a4febbae56b30f"
+    }
+    Frame {
+        msec: 1136
+        hash: "9d66290b1aae1de3025d24d3efc4ca1c"
+    }
+    Frame {
+        msec: 1152
+        hash: "2c05cf00e3417883e789f58c2728dc97"
+    }
+    Frame {
+        msec: 1168
+        hash: "e5b54132ffb83acad30622e969405bc0"
+    }
+    Frame {
+        msec: 1184
+        hash: "255d1d45d3343972f156dfab7d13ce41"
+    }
+    Frame {
+        msec: 1200
+        hash: "5747adbc4f0b22ed359793d72d3e7d1f"
+    }
+    Frame {
+        msec: 1216
+        hash: "94f922f3460ad76cd05cb5b321977a94"
+    }
+    Frame {
+        msec: 1232
+        hash: "5d97175fc4d986e5b21758d4ac785025"
+    }
+    Frame {
+        msec: 1248
+        hash: "c51f12a2f438f137785c70e3af4922fd"
+    }
+    Frame {
+        msec: 1264
+        hash: "3f7a9cecf2a590e8728137fabfd3f5f3"
+    }
+    Frame {
+        msec: 1280
+        hash: "b420fc71b22fa608a9c0cdbbbc61c447"
+    }
+    Frame {
+        msec: 1296
+        hash: "5b77af55f0a723ba762d283f41e91c98"
+    }
+    Frame {
+        msec: 1312
+        hash: "2578335ac6f21c8aec2c87515562c321"
+    }
+    Frame {
+        msec: 1328
+        hash: "a9b5438bd48dbafd307d571877416003"
+    }
+    Frame {
+        msec: 1344
+        hash: "6a4e2ee45b26037421e2a5f2d6ee517e"
+    }
+    Frame {
+        msec: 1360
+        hash: "c272aeea2b9c450fbd732305ccc01b93"
+    }
+    Frame {
+        msec: 1376
+        hash: "37c7e50c270e8feb4dd9018580284a85"
+    }
+    Frame {
+        msec: 1392
+        hash: "4f37d72c10e51f68a2359086094da249"
+    }
+    Frame {
+        msec: 1408
+        hash: "a37024356613bd5d678e0b2f7b8f5959"
+    }
+    Frame {
+        msec: 1424
+        hash: "9a4bf1400da038f2088dd4c49403d852"
+    }
+    Frame {
+        msec: 1440
+        hash: "4e401b5ebff6e442fa108e94a5dba668"
+    }
+    Frame {
+        msec: 1456
+        hash: "5bd3cc309a5fce6183654975543250b2"
+    }
+    Frame {
+        msec: 1472
+        hash: "d423a9bc912237d0f20b924849ba0cb1"
+    }
+    Frame {
+        msec: 1488
+        hash: "25f463e91febf5b6d8819fd5010bc1c2"
+    }
+    Frame {
+        msec: 1504
+        hash: "3c84122b0933ee870f178d39469e51e2"
+    }
+    Frame {
+        msec: 1520
+        hash: "7e8dfe86ea0849022355b12578d4cb1a"
+    }
+    Frame {
+        msec: 1536
+        hash: "a60edcf8d792f93a839e6ddbafbf993f"
+    }
+    Frame {
+        msec: 1552
+        hash: "abf3d90803cfa12d35d2752be7ea02d8"
+    }
+    Frame {
+        msec: 1568
+        hash: "48a7dbed293fbbd5ea202190837a411f"
+    }
+    Frame {
+        msec: 1584
+        hash: "2f06ee407e5175d4b954e31c39c9522c"
+    }
+    Frame {
+        msec: 1600
+        hash: "5784deb0f3270cf7a0d0964cd9d31458"
+    }
+    Frame {
+        msec: 1616
+        hash: "809870dfd9b05ce07170edd945348ddf"
+    }
+    Frame {
+        msec: 1632
+        hash: "08bc6815601417f3731eaae398d0861d"
+    }
+    Frame {
+        msec: 1648
+        hash: "ace9db9112d147569dc0cf1a1b680d6c"
+    }
+    Frame {
+        msec: 1664
+        hash: "14d08c2ca430631af8ede1013f4f4da0"
+    }
+    Frame {
+        msec: 1680
+        hash: "1475ae722afd169cc0c8e1fde39eb6b7"
+    }
+    Frame {
+        msec: 1696
+        hash: "58cfba3aae4bf54a5b445e0e34571d2d"
+    }
+    Frame {
+        msec: 1712
+        hash: "a6916da6bfac27aa87d75da2bbb73f31"
+    }
+    Frame {
+        msec: 1728
+        hash: "87636076959de7e5a0a8bd8b31354ed4"
+    }
+    Frame {
+        msec: 1744
+        hash: "16e2b66f28ed80d80d9b5264d89624d5"
+    }
+    Frame {
+        msec: 1760
+        hash: "d3689b53474b4b26630d70ba01c057b4"
+    }
+    Frame {
+        msec: 1776
+        hash: "11436091b24c02af94dfa75a5fd1a001"
+    }
+    Frame {
+        msec: 1792
+        hash: "524840a3453af4e97ac82b559308cce3"
+    }
+    Frame {
+        msec: 1808
+        hash: "6712be93cf1ed2b7b202367418b6d2d7"
+    }
+    Frame {
+        msec: 1824
+        hash: "7dc26fd658f626b8fe18545cf93dc4ec"
+    }
+    Frame {
+        msec: 1840
+        hash: "8a64b18006ad0bd2c373a2a9395ce52e"
+    }
+    Frame {
+        msec: 1856
+        hash: "32d0e9005ebb9dfd410d348e336bcd93"
+    }
+    Frame {
+        msec: 1872
+        hash: "98dbd004cf4809dbc90bfa9272378644"
+    }
+    Frame {
+        msec: 1888
+        hash: "0b43fdee23346c30c60b822a20131cc3"
+    }
+    Frame {
+        msec: 1904
+        hash: "0696257de0441666bd264f8db6383d15"
+    }
+    Frame {
+        msec: 1920
+        image: "zoomTextOnly.1.png"
+    }
+    Frame {
+        msec: 1936
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 1952
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 1968
+        hash: "7df07aea83bc5c3213e7871854661820"
+    }
+    Frame {
+        msec: 1984
+        hash: "4fc1ef611b24ec5737310859b12c83d3"
+    }
+    Frame {
+        msec: 2000
+        hash: "c2f8551d0442d0736b71c54fc965562b"
+    }
+    Frame {
+        msec: 2016
+        hash: "4ec29787e437f9619ce0f0a0f4889d0f"
+    }
+    Frame {
+        msec: 2032
+        hash: "c2f8551d0442d0736b71c54fc965562b"
+    }
+    Frame {
+        msec: 2048
+        hash: "4fc1ef611b24ec5737310859b12c83d3"
+    }
+    Frame {
+        msec: 2064
+        hash: "7df07aea83bc5c3213e7871854661820"
+    }
+    Frame {
+        msec: 2080
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 2096
+        hash: "0ae4ee18cc675749f008b897fe35cc40"
+    }
+    Frame {
+        msec: 2112
+        hash: "f5c917c7ca26bb916dd4df84eafc8e94"
+    }
+    Frame {
+        msec: 2128
+        hash: "0696257de0441666bd264f8db6383d15"
+    }
+    Frame {
+        msec: 2144
+        hash: "0b43fdee23346c30c60b822a20131cc3"
+    }
+    Frame {
+        msec: 2160
+        hash: "98dbd004cf4809dbc90bfa9272378644"
+    }
+    Frame {
+        msec: 2176
+        hash: "32d0e9005ebb9dfd410d348e336bcd93"
+    }
+    Frame {
+        msec: 2192
+        hash: "8a64b18006ad0bd2c373a2a9395ce52e"
+    }
+    Frame {
+        msec: 2208
+        hash: "7dc26fd658f626b8fe18545cf93dc4ec"
+    }
+    Frame {
+        msec: 2224
+        hash: "6712be93cf1ed2b7b202367418b6d2d7"
+    }
+    Frame {
+        msec: 2240
+        hash: "524840a3453af4e97ac82b559308cce3"
+    }
+    Frame {
+        msec: 2256
+        hash: "11436091b24c02af94dfa75a5fd1a001"
+    }
+    Frame {
+        msec: 2272
+        hash: "d3689b53474b4b26630d70ba01c057b4"
+    }
+    Frame {
+        msec: 2288
+        hash: "16e2b66f28ed80d80d9b5264d89624d5"
+    }
+    Frame {
+        msec: 2304
+        hash: "87636076959de7e5a0a8bd8b31354ed4"
+    }
+    Frame {
+        msec: 2320
+        hash: "a6916da6bfac27aa87d75da2bbb73f31"
+    }
+    Frame {
+        msec: 2336
+        hash: "58cfba3aae4bf54a5b445e0e34571d2d"
+    }
+    Frame {
+        msec: 2352
+        hash: "1475ae722afd169cc0c8e1fde39eb6b7"
+    }
+    Frame {
+        msec: 2368
+        hash: "14d08c2ca430631af8ede1013f4f4da0"
+    }
+    Frame {
+        msec: 2384
+        hash: "ace9db9112d147569dc0cf1a1b680d6c"
+    }
+    Frame {
+        msec: 2400
+        hash: "08bc6815601417f3731eaae398d0861d"
+    }
+    Frame {
+        msec: 2416
+        hash: "809870dfd9b05ce07170edd945348ddf"
+    }
+    Frame {
+        msec: 2432
+        hash: "5784deb0f3270cf7a0d0964cd9d31458"
+    }
+    Frame {
+        msec: 2448
+        hash: "2f06ee407e5175d4b954e31c39c9522c"
+    }
+    Frame {
+        msec: 2464
+        hash: "48a7dbed293fbbd5ea202190837a411f"
+    }
+    Frame {
+        msec: 2480
+        hash: "abf3d90803cfa12d35d2752be7ea02d8"
+    }
+    Frame {
+        msec: 2496
+        hash: "a60edcf8d792f93a839e6ddbafbf993f"
+    }
+    Frame {
+        msec: 2512
+        hash: "7e8dfe86ea0849022355b12578d4cb1a"
+    }
+    Frame {
+        msec: 2528
+        hash: "3c84122b0933ee870f178d39469e51e2"
+    }
+    Frame {
+        msec: 2544
+        hash: "25f463e91febf5b6d8819fd5010bc1c2"
+    }
+    Frame {
+        msec: 2560
+        hash: "d423a9bc912237d0f20b924849ba0cb1"
+    }
+    Frame {
+        msec: 2576
+        hash: "5bd3cc309a5fce6183654975543250b2"
+    }
+    Frame {
+        msec: 2592
+        hash: "4e401b5ebff6e442fa108e94a5dba668"
+    }
+}
diff --git a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.html b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.html
new file mode 100644
index 0000000..4997712
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+<h1>Zoom Text Only</h1>
+<p>
+This test shows how zooming can be done just
+on text, not images.
+<img src="qtlogo.png">
diff --git a/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml
new file mode 100644
index 0000000..55cd9bc
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/zooming/zoomTextOnly.qml
@@ -0,0 +1,15 @@
+import Qt 4.6
+
+WebView {
+    width: 200
+    height: 250
+    url: "zoomTextOnly.html"
+    settings.zoomTextOnly: true
+    zoomFactor:
+        SequentialAnimation {
+            running: true
+            repeat: true
+            NumberAnimation { from: 2; to: 0.25; duration: 1000 }
+            NumberAnimation { from: 0.25; to: 2; duration: 1000 }
+        }
+}
-- 
cgit v0.12


From 2e72795565ac73b95ada86a461735cbe8b7721ad Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 6 Nov 2009 13:28:08 +1000
Subject: better statusText test

---
 tests/auto/declarative/qmlgraphicswebview/data/basic.html            | 5 +++++
 tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/auto/declarative/qmlgraphicswebview/data/basic.html b/tests/auto/declarative/qmlgraphicswebview/data/basic.html
index c262f12..22e3e24 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/basic.html
+++ b/tests/auto/declarative/qmlgraphicswebview/data/basic.html
@@ -1,6 +1,11 @@
 <html>
 <head><title>Basic</title>
 <link rel="icon" sizes="48x48" href="basic.png">
+<script type="text/javascript">
+<!--
+window.onload = function(){ window.status = "status here"; }
+// -->
+</script>
 </head>
 <body leftmargin="0" marginwidth="0">
 <table width="123">
diff --git a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
index e7e9204..6cf6741 100644
--- a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
+++ b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
@@ -131,7 +131,7 @@ void tst_qmlgraphicswebview::basicProperties()
     QCOMPARE(wv->title(),QString("Basic"));
     QTRY_COMPARE(wv->icon().width(), 48);
     QCOMPARE(wv->icon(),QPixmap(SRCDIR "/data/basic.png"));
-    QCOMPARE(wv->statusText(),QString(""));
+    QCOMPARE(wv->statusText(),QString("status here"));
     QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/basic.html")), strippedHtml(wv->html()));
     QCOMPARE(wv->width(), 123.0);
     QCOMPARE(wv->webPageWidth(), 0);
@@ -167,7 +167,7 @@ void tst_qmlgraphicswebview::historyNav()
         QCOMPARE(wv->title(),QString("Basic"));
         QTRY_COMPARE(wv->icon().width(), 48);
         QCOMPARE(wv->icon(),QPixmap(SRCDIR "/data/basic.png"));
-        QCOMPARE(wv->statusText(),QString(""));
+        QCOMPARE(wv->statusText(),QString("status here"));
         QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/basic.html")), strippedHtml(wv->html()));
         QCOMPARE(wv->width(), 123.0);
         QCOMPARE(wv->webPageWidth(), 0);
@@ -193,6 +193,7 @@ void tst_qmlgraphicswebview::historyNav()
     QCOMPARE(strippedHtml(fileContents(SRCDIR "/data/forward.html")), strippedHtml(wv->html()));
     QCOMPARE(wv->url(), QUrl::fromLocalFile(SRCDIR "/data/forward.html"));
     QCOMPARE(wv->status(), QmlGraphicsWebView::Ready);
+    QCOMPARE(wv->statusText(),QString(""));
     QVERIFY(wv->reloadAction());
     QVERIFY(wv->reloadAction()->isEnabled());
     QVERIFY(wv->backAction());
-- 
cgit v0.12


From 2fb5889ea55209528fd19b7a34faac7c5be2b1b4 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 9 Nov 2009 08:55:59 +1000
Subject: Fix crash when watch is deleted before calling removeWatch().

---
 src/declarative/debugger/qmldebug.cpp | 12 +++++++++++-
 src/declarative/debugger/qmldebug_p.h |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/declarative/debugger/qmldebug.cpp b/src/declarative/debugger/qmldebug.cpp
index b06a250..1403ffa 100644
--- a/src/declarative/debugger/qmldebug.cpp
+++ b/src/declarative/debugger/qmldebug.cpp
@@ -69,6 +69,7 @@ public:
 
     void decode(QDataStream &, QmlDebugContextReference &);
     void decode(QDataStream &, QmlDebugObjectReference &, bool simple);
+
     static void remove(QmlEngineDebug *, QmlDebugEnginesQuery *);
     static void remove(QmlEngineDebug *, QmlDebugRootContextQuery *);
     static void remove(QmlEngineDebug *, QmlDebugObjectQuery *);
@@ -133,6 +134,7 @@ void QmlEngineDebugPrivate::remove(QmlEngineDebug *c, QmlDebugExpressionQuery *q
         p->expressionQuery.remove(q->m_queryId);
 }
 
+
 Q_DECLARE_METATYPE(QmlDebugObjectReference);
 void QmlEngineDebugPrivate::decode(QDataStream &ds, QmlDebugObjectReference &o,
                                    bool simple)
@@ -345,6 +347,7 @@ QmlDebugPropertyWatch *QmlEngineDebug::addWatch(const QmlDebugPropertyReference
     if (d->client->isConnected()) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
+        watch->m_client = this;
         watch->m_objectDebugId = property.objectDebugId();
         watch->m_name = property.name();
         d->watched.insert(queryId, watch);
@@ -373,6 +376,7 @@ QmlDebugObjectExpressionWatch *QmlEngineDebug::addWatch(const QmlDebugObjectRefe
     if (d->client->isConnected()) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
+        watch->m_client = this;
         watch->m_objectDebugId = object.debugId();
         watch->m_expr = expr;
         d->watched.insert(queryId, watch);
@@ -395,6 +399,7 @@ QmlDebugWatch *QmlEngineDebug::addWatch(const QmlDebugObjectReference &object, Q
     if (d->client->isConnected()) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
+        watch->m_client = this;
         watch->m_objectDebugId = object.debugId();
         d->watched.insert(queryId, watch);
 
@@ -544,8 +549,13 @@ QmlDebugExpressionQuery *QmlEngineDebug::queryExpressionResult(int objectDebugId
 }
 
 QmlDebugWatch::QmlDebugWatch(QObject *parent)
-: QObject(parent), m_state(Waiting), m_queryId(-1), m_objectDebugId(-1)
+: QObject(parent), m_state(Waiting), m_queryId(-1), m_client(0), m_objectDebugId(-1)
+{
+}
+
+QmlDebugWatch::~QmlDebugWatch()
 {
+    m_client->removeWatch(this);
 }
 
 int QmlDebugWatch::queryId() const
diff --git a/src/declarative/debugger/qmldebug_p.h b/src/declarative/debugger/qmldebug_p.h
index d7e4f5a..4bc54e8 100644
--- a/src/declarative/debugger/qmldebug_p.h
+++ b/src/declarative/debugger/qmldebug_p.h
@@ -106,6 +106,7 @@ public:
     enum State { Waiting, Active, Inactive, Dead };
 
     QmlDebugWatch(QObject *);
+    ~QmlDebugWatch();
 
     int queryId() const;
     int objectDebugId() const;
@@ -125,6 +126,7 @@ private:
     void setState(State);
     State m_state;
     int m_queryId;
+    QmlEngineDebug *m_client;
     int m_objectDebugId;
 };
 
-- 
cgit v0.12


From c45309cd037d099dd23e4bce8c5a7d1d41d5ceaa Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Mon, 9 Nov 2009 12:37:16 +1000
Subject: constness fix

---
 src/declarative/qml/qmlinfo.cpp | 4 ++--
 src/declarative/qml/qmlinfo.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp
index f62f5fd..5ebcd8d 100644
--- a/src/declarative/qml/qmlinfo.cpp
+++ b/src/declarative/qml/qmlinfo.cpp
@@ -47,7 +47,7 @@
 QT_BEGIN_NAMESPACE
 
 /*!
-    \fn void qmlInfo(const QString& message, QObject *object)
+    \fn void qmlInfo(const QString& message, const QObject *object)
 
     \brief Prints warnings messages that include the file and line number for QML types.
 
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
     \endcode
 */
 
-void qmlInfo(const QString& msg, QObject* object)
+void qmlInfo(const QString& msg, const QObject* object)
 {
     QString pos = QLatin1String("QML");
     if (object) {
diff --git a/src/declarative/qml/qmlinfo.h b/src/declarative/qml/qmlinfo.h
index 2e26ea4..1660aa2 100644
--- a/src/declarative/qml/qmlinfo.h
+++ b/src/declarative/qml/qmlinfo.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-Q_DECLARATIVE_EXPORT void qmlInfo(const QString& msg, QObject *me=0);
+Q_DECLARATIVE_EXPORT void qmlInfo(const QString& msg, const QObject *me=0);
 
 QT_END_NAMESPACE
 
-- 
cgit v0.12


From 11bbed0a7cfd4b5295109341c3dc6df339b4df05 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 9 Nov 2009 13:07:05 +1000
Subject: QmlContext objects shouldn't be added to object tree.

---
 src/declarative/qml/qmlenginedebug.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmlenginedebug.cpp b/src/declarative/qml/qmlenginedebug.cpp
index 52d54b9..20d6fc1 100644
--- a/src/declarative/qml/qmlenginedebug.cpp
+++ b/src/declarative/qml/qmlenginedebug.cpp
@@ -99,6 +99,7 @@ QmlEngineDebugServer::QmlObjectProperty
 QmlEngineDebugServer::propertyData(QObject *obj, int propIdx)
 {
     QmlObjectProperty rv;
+;
 
     QMetaProperty prop = obj->metaObject()->property(propIdx);
 
@@ -165,7 +166,7 @@ void QmlEngineDebugServer::buildObjectDump(QDataStream &message,
     
     int childrenCount = children.count();
     for (int ii = 0; ii < children.count(); ++ii) {
-        if (QmlBoundSignal::cast(children[ii]))
+        if (qobject_cast<QmlContext*>(children[ii]) || QmlBoundSignal::cast(children[ii]))
             --childrenCount;
     }
 
@@ -175,6 +176,8 @@ void QmlEngineDebugServer::buildObjectDump(QDataStream &message,
 
     for (int ii = 0; ii < children.count(); ++ii) {
         QObject *child = children.at(ii);
+        if (qobject_cast<QmlContext*>(child))
+            continue;
         QmlBoundSignal *signal = QmlBoundSignal::cast(child);
         if (signal) {
             QmlObjectProperty prop;
-- 
cgit v0.12


From d96ec3cff51b952a2db9dd016ca5b21d9bb21adf Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Mon, 9 Nov 2009 13:07:25 +1000
Subject: ListModel docs and tests

---
 src/declarative/util/qmllistmodel.cpp              |  73 ++++++++---
 src/declarative/util/qmllistmodel_p.h              |   3 +-
 .../qmlgraphicswebview/data/javaScript.qml         |   5 +
 .../auto/declarative/qmllistmodel/qmllistmodel.pro |   6 +
 .../declarative/qmllistmodel/tst_qmllistmodel.cpp  | 138 +++++++++++++++++++++
 .../declarative/visual/webview/embedding/egg.qml   |  27 ++++
 .../visual/webview/embedding/nesting.html          |   9 ++
 .../visual/webview/embedding/nesting.qml           |   8 ++
 8 files changed, 253 insertions(+), 16 deletions(-)
 create mode 100644 tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
 create mode 100644 tests/auto/declarative/qmllistmodel/qmllistmodel.pro
 create mode 100644 tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
 create mode 100644 tests/auto/declarative/visual/webview/embedding/egg.qml
 create mode 100644 tests/auto/declarative/visual/webview/embedding/nesting.html
 create mode 100644 tests/auto/declarative/visual/webview/embedding/nesting.qml

diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index afc6735..fbd957c 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -45,9 +45,11 @@
 #include <private/qmlcustomparser_p.h>
 #include <private/qmlparser_p.h>
 #include "qmlopenmetaobject_p.h"
+#include <private/qmlengine_p.h>
 #include <qmlcontext.h>
 #include "qmllistmodel_p.h"
 #include <QtScript/qscriptvalueiterator.h>
+#include "qmlinfo.h"
 
 Q_DECLARE_METATYPE(QListModelInterface *)
 
@@ -264,6 +266,7 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(ModelNode *)
 
 QT_BEGIN_NAMESPACE
+
 void ModelNode::setObjectValue(const QScriptValue& valuemap) {
     QScriptValueIterator it(valuemap);
     while (it.hasNext()) {
@@ -451,14 +454,17 @@ void QmlListModel::clear()
 */
 void QmlListModel::remove(int index)
 {
-    if (_root) {
-        ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-        _root->values.removeAt(index);
-        if (node)
-            delete node;
-        emit itemsRemoved(index,1);
-        emit countChanged(_root->values.count());
+    if (!_root || index < 0 || index >= _root->values.count()) {
+        qmlInfo(tr("remove: index %1 out of range").arg(index),this);
+        return;
     }
+
+    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
+    _root->values.removeAt(index);
+    if (node)
+        delete node;
+    emit itemsRemoved(index,1);
+    emit countChanged(_root->values.count());
 }
 
 /*!
@@ -480,9 +486,11 @@ void QmlListModel::insert(int index, const QScriptValue& valuemap)
 {
     if (!_root)
         _root = new ModelNode;
-    if (index >= _root->values.count()) {
+    if (index >= _root->values.count() || index<0) {
         if (index == _root->values.count())
             append(valuemap);
+        else
+            qmlInfo(tr("insert: index %1 out of range").arg(index),this);
         return;
     }
     ModelNode *mn = new ModelNode;
@@ -508,8 +516,10 @@ void QmlListModel::insert(int index, const QScriptValue& valuemap)
 */
 void QmlListModel::move(int from, int to, int n)
 {
-    if (from+n > count() || to+n > count() || n==0 || from==to || from < 0 || to < 0)
+    if (n==0 || from==to)
         return;
+    if (from+n > count() || to+n > count() || from < 0 || to < 0)
+        qmlInfo(tr("move: out of range"),this);
     int origfrom=from; // preserve actual move, so any animations are correct
     int origto=to;
     int orign=n;
@@ -556,7 +566,7 @@ void QmlListModel::move(int from, int to, int n)
 void QmlListModel::append(const QScriptValue& valuemap)
 {
     if (!valuemap.isObject()) {
-        qWarning("ListModel::append: value is not an object");
+        qmlInfo(tr("append: value is not an object"),this);
         return;
     }
     if (!_root)
@@ -569,10 +579,43 @@ void QmlListModel::append(const QScriptValue& valuemap)
 }
 
 /*!
+    \qmlmethod dict ListModel::get(index)
+
+    Returns the item at \a index in the list model.
+
+    \code
+        FruitModel.append({"cost": 5.95, "name":"Pizza"})
+        FruitModel.get(0).cost
+    \endcode
+
+    The \a index must be an element in the list.
+
+    \sa append()
+*/
+QScriptValue QmlListModel::get(int index) const
+{
+    if (index >= count()) {
+        qmlInfo(tr("get: index %1 out of range").arg(index),this);
+        return 0;
+    }
+
+    ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
+    if (!node) 
+        return 0;
+    QmlEngine *eng = qmlEngine(this);
+    if (!eng) {
+        qWarning("Cannot call QmlListModel::get() without a QmlEngine");
+        return 0;
+    }
+    return QmlEnginePrivate::qmlScriptObject(node->object(), eng);
+}
+
+/*!
     \qmlmethod ListModel::set(index,dict)
 
-    Changes the item at \a index in the list model to the
-    values in \a dict.
+    Changes the item at \a index in the list model with the
+    values in \a dict. Properties not appearing in \a valuemap
+    are left unchanged.
 
     \code
         FruitModel.set(3, {"cost": 5.95, "name":"Pizza"})
@@ -586,8 +629,8 @@ void QmlListModel::set(int index, const QScriptValue& valuemap)
 {
     if (!_root)
         _root = new ModelNode;
-    if ( index >= _root->values.count()) {
-        qWarning() << "ListModel::set index out of range:" << index;
+    if ( index > _root->values.count()) {
+        qmlInfo(tr("set: index %1 out of range").arg(index),this);
         return;
     }
     if (index == _root->values.count())
@@ -628,7 +671,7 @@ void QmlListModel::set(int index, const QString& property, const QVariant& value
     if (!_root)
         _root = new ModelNode;
     if ( index >= _root->values.count()) {
-        qWarning() << "ListModel::set index out of range:" << index;
+        qmlInfo(tr("set: index %1 out of range").arg(index),this);
         return;
     }
     ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
diff --git a/src/declarative/util/qmllistmodel_p.h b/src/declarative/util/qmllistmodel_p.h
index 31365d1..34b1562 100644
--- a/src/declarative/util/qmllistmodel_p.h
+++ b/src/declarative/util/qmllistmodel_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 struct ModelNode;
-class QmlListModel : public QListModelInterface
+class Q_DECLARATIVE_EXPORT QmlListModel : public QListModelInterface
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged)
@@ -77,6 +77,7 @@ public:
     Q_INVOKABLE void remove(int index);
     Q_INVOKABLE void append(const QScriptValue&);
     Q_INVOKABLE void insert(int index, const QScriptValue&);
+    Q_INVOKABLE QScriptValue get(int index) const;
     Q_INVOKABLE void set(int index, const QScriptValue&);
     Q_INVOKABLE void set(int index, const QString& property, const QVariant& value);
     Q_INVOKABLE void move(int from, int to, int count);
diff --git a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
new file mode 100644
index 0000000..75d0cea
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
@@ -0,0 +1,5 @@
+import Qt 4.6
+
+WebView {
+    url: "javaScript.html"
+}
diff --git a/tests/auto/declarative/qmllistmodel/qmllistmodel.pro b/tests/auto/declarative/qmllistmodel/qmllistmodel.pro
new file mode 100644
index 0000000..60b0c4b
--- /dev/null
+++ b/tests/auto/declarative/qmllistmodel/qmllistmodel.pro
@@ -0,0 +1,6 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+QT += script
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qmllistmodel.cpp
diff --git a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
new file mode 100644
index 0000000..9ce1a7c
--- /dev/null
+++ b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QtDeclarative/private/qmllistmodel_p.h>
+#include <QtDeclarative/private/qmlexpression_p.h>
+#include <QDebug>
+
+class tst_QmlListModel : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlListModel() {}
+
+private slots:
+    void dynamic_data();
+    void dynamic();
+};
+
+void tst_QmlListModel::dynamic_data()
+{
+    QTest::addColumn<QString>("script");
+    QTest::addColumn<int>("result");
+    QTest::addColumn<QString>("warning");
+
+    // Simple flat model
+
+    QTest::newRow("count") << "count" << 0 << "";
+
+    QTest::newRow("append1") << "{append({'foo':123});count}" << 1 << "";
+    QTest::newRow("append2") << "{append({'foo':123,'bar':456});count}" << 1 << "";
+    QTest::newRow("append3a") << "{append({'foo':123});append({'foo':456});get(0).foo}" << 123 << "";
+    QTest::newRow("append3b") << "{append({'foo':123});append({'foo':456});get(1).foo}" << 456 << "";
+
+    QTest::newRow("clear1") << "{append({'foo':456});clear();count}" << 0 << "";
+    QTest::newRow("clear2") << "{append({'foo':123});append({'foo':456});clear();count}" << 0 << "";
+    QTest::newRow("clear2") << "{append({'foo':123});clear();get(0).foo}" << 0 << "QML QmlListModel (unknown location) get: index 0 out of range";
+
+    QTest::newRow("remove1") << "{append({'foo':123});remove(0);count}" << 0 << "";
+    QTest::newRow("remove2a") << "{append({'foo':123});append({'foo':456});remove(0);count}" << 1 << "";
+    QTest::newRow("remove2b") << "{append({'foo':123});append({'foo':456});remove(0);get(0).foo}" << 456 << "";
+    QTest::newRow("remove2c") << "{append({'foo':123});append({'foo':456});remove(1);get(0).foo}" << 123 << "";
+    QTest::newRow("remove3") << "{append({'foo':123});remove(0);get(0).foo}" << 0 << "QML QmlListModel (unknown location) get: index 0 out of range";
+
+    QTest::newRow("insert1") << "{insert(0,{'foo':123});count}" << 1 << "";
+    QTest::newRow("insert2") << "{insert(1,{'foo':123});count}" << 0 << "QML QmlListModel (unknown location) insert: index 1 out of range";
+    QTest::newRow("insert3a") << "{append({'foo':123});insert(1,{'foo':456});count}" << 2 << "";
+    QTest::newRow("insert3b") << "{append({'foo':123});insert(1,{'foo':456});get(0).foo}" << 123 << "";
+    QTest::newRow("insert3c") << "{append({'foo':123});insert(1,{'foo':456});get(1).foo}" << 456 << "";
+    QTest::newRow("insert3d") << "{append({'foo':123});insert(0,{'foo':456});get(0).foo}" << 456 << "";
+    QTest::newRow("insert3e") << "{append({'foo':123});insert(0,{'foo':456});get(1).foo}" << 123 << "";
+    QTest::newRow("insert4") << "{append({'foo':123});insert(-1,{'foo':456})}" << 0 << "QML QmlListModel (unknown location) insert: index -1 out of range";
+
+    QTest::newRow("set1") << "{append({'foo':123});set(0,{'foo':456});count}" << 1 << "";
+    QTest::newRow("set2") << "{append({'foo':123});set(0,{'foo':456});get(0).foo}" << 456 << "";
+    QTest::newRow("set3a") << "{append({'foo':123,'bar':456});set(0,{'foo':999});get(0).foo}" << 999 << "";
+    QTest::newRow("set3b") << "{append({'foo':123,'bar':456});set(0,{'foo':999});get(0).bar}" << 456 << "";
+
+    QTest::newRow("setprop1") << "{append({'foo':123});set(0,'foo',456);count}" << 1 << "";
+    QTest::newRow("setprop2") << "{append({'foo':123});set(0,'foo',456);get(0).foo}" << 456 << "";
+    QTest::newRow("setprop3a") << "{append({'foo':123,'bar':456});set(0,'foo',999);get(0).foo}" << 999 << "";
+    QTest::newRow("setprop3b") << "{append({'foo':123,'bar':456});set(0,'foo',999);get(0).bar}" << 456 << "";
+
+    QTest::newRow("move1a") << "{append({'foo':123});append({'foo':456});move(0,1,1);count}" << 2 << "";
+    QTest::newRow("move1b") << "{append({'foo':123});append({'foo':456});move(0,1,1);get(0).foo}" << 456 << "";
+    QTest::newRow("move1c") << "{append({'foo':123});append({'foo':456});move(0,1,1);get(1).foo}" << 123 << "";
+    QTest::newRow("move1d") << "{append({'foo':123});append({'foo':456});move(1,0,1);get(0).foo}" << 456 << "";
+    QTest::newRow("move1e") << "{append({'foo':123});append({'foo':456});move(1,0,1);get(1).foo}" << 123 << "";
+    QTest::newRow("move2a") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);count}" << 3 << "";
+    QTest::newRow("move2b") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);get(0).foo}" << 789 << "";
+    QTest::newRow("move2c") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);get(1).foo}" << 123 << "";
+    QTest::newRow("move2d") << "{append({'foo':123});append({'foo':456});append({'foo':789});move(0,1,2);get(2).foo}" << 456 << "";
+
+    // Structured model
+
+    // XXX todo
+}
+
+void tst_QmlListModel::dynamic()
+{
+    QFETCH(QString, script);
+    QFETCH(int, result);
+    QFETCH(QString, warning);
+
+    QmlEngine engine;
+    QmlListModel model;
+    QmlEngine::setContextForObject(&model,engine.rootContext());
+    engine.rootContext()->addDefaultObject(&model);
+    QmlExpression e(engine.rootContext(), script, &model);
+    if (!warning.isEmpty())
+        QTest::ignoreMessage(QtWarningMsg, warning.toLatin1());
+    int actual = e.value().toInt();
+    if (e.hasError())
+        qDebug() << e.error(); // errors not expected
+    QVERIFY(!e.hasError());
+    QCOMPARE(actual,result);
+}
+
+QTEST_MAIN(tst_QmlListModel)
+
+#include "tst_qmllistmodel.moc"
diff --git a/tests/auto/declarative/visual/webview/embedding/egg.qml b/tests/auto/declarative/visual/webview/embedding/egg.qml
new file mode 100644
index 0000000..a9019d1
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/embedding/egg.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+
+Item {
+    property var period : 250
+    property var color : "black"
+    id: root
+
+    Item {
+        x: root.width/2
+        y: root.height/2
+        Rectangle {
+            radius: width/2
+            color: root.color
+            x: -width/2
+            y: -height/2
+            width: root.width*1.5
+            height: root.height*1.5
+        }
+        rotation: NumberAnimation {
+            from: 0
+            to: 360
+            repeat: true
+            running: true
+            duration: root.period
+        }
+    }
+}
diff --git a/tests/auto/declarative/visual/webview/embedding/nesting.html b/tests/auto/declarative/visual/webview/embedding/nesting.html
new file mode 100644
index 0000000..6e81689
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/embedding/nesting.html
@@ -0,0 +1,9 @@
+<html>
+<head><title>Nesting</title>
+<link rel="icon" sizes="48x48" href="basic.png">
+</head>
+<body bgcolor="green">
+<h1>Nesting</h1>
+This is a test...
+<OBJECT data=egg.qml TYPE=application/x-qt-plugin width=50 height=70 period=2000 color=white></OBJECT>
+... with a spinning QML egg nested in it.
diff --git a/tests/auto/declarative/visual/webview/embedding/nesting.qml b/tests/auto/declarative/visual/webview/embedding/nesting.qml
new file mode 100644
index 0000000..0d76579
--- /dev/null
+++ b/tests/auto/declarative/visual/webview/embedding/nesting.qml
@@ -0,0 +1,8 @@
+import Qt 4.6
+
+WebView {
+    width: 300
+    height: 200
+    url: "nesting.html"
+    settings.pluginsEnabled: true
+}
-- 
cgit v0.12


From 65ebb736e7d1f134b6d3dc5c620de43b9880d544 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Mon, 9 Nov 2009 13:08:26 +1000
Subject: webview JS test

---
 .../declarative/qmlgraphicswebview/data/javaScript.qml     |  6 ++++++
 .../qmlgraphicswebview/tst_qmlgraphicswebview.cpp          | 14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
index 75d0cea..28742f3 100644
--- a/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
+++ b/tests/auto/declarative/qmlgraphicswebview/data/javaScript.qml
@@ -2,4 +2,10 @@ import Qt 4.6
 
 WebView {
     url: "javaScript.html"
+    javaScriptWindowObjects: [
+        Object {
+            property string qmlprop: "qmlvalue"
+            WebView.windowObjectName: "myjsname"
+        }
+    ]
 }
diff --git a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
index 6cf6741..c05f8a6 100644
--- a/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
+++ b/tests/auto/declarative/qmlgraphicswebview/tst_qmlgraphicswebview.cpp
@@ -59,9 +59,9 @@ private slots:
     void historyNav();
     void loadError();
     void setHtml();
+    void javaScript();
     void cleanupTestCase();
 
-
 private:
     void checkNoErrors(const QmlComponent& component);
     QmlEngine engine;
@@ -248,6 +248,18 @@ void tst_qmlgraphicswebview::setHtml()
     QCOMPARE(wv->html(),QString("<html><head></head><body><p>This is a <b>string</b> set on the WebView</p></body></html>"));
 }
 
+void tst_qmlgraphicswebview::javaScript()
+{
+    QmlComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/javaScript.qml"));
+    checkNoErrors(component);
+    QmlGraphicsWebView *wv = qobject_cast<QmlGraphicsWebView*>(component.create());
+    QVERIFY(wv != 0);
+    QTRY_COMPARE(wv->progress(), 1.0);
+    QCOMPARE(wv->evaluateJavaScript("123").toInt(), 123);
+    QCOMPARE(wv->evaluateJavaScript("window.status").toString(), QString("status here"));
+    QCOMPARE(wv->evaluateJavaScript("window.myjsname.qmlprop").toString(), QString("qmlvalue"));
+}
+
 QTEST_MAIN(tst_qmlgraphicswebview)
 
 #include "tst_qmlgraphicswebview.moc"
-- 
cgit v0.12


From 034c9f1b81cfa2d854f87b08e945296d3c1fac85 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 9 Nov 2009 13:08:49 +1000
Subject: Initial qmldebug tests.

---
 tests/auto/declarative/declarative.pro           |   1 +
 tests/auto/declarative/qmldebug/qmldebug.pro     |   5 +
 tests/auto/declarative/qmldebug/tst_qmldebug.cpp | 594 +++++++++++++++++++++++
 3 files changed, 600 insertions(+)
 create mode 100644 tests/auto/declarative/qmldebug/qmldebug.pro
 create mode 100644 tests/auto/declarative/qmldebug/tst_qmldebug.cpp

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index b9f59d6..a31be0b 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -16,6 +16,7 @@ SUBDIRS += \
            qfxwebview \             # Cover
            qmetaobjectbuilder \     # Cover
            qmlcontext \             # Cover
+           qmldebug \               # Cover
            qmldom \                 # Cover
            qmlecmascript \          # Cover
            qmlfontloader \          # Cover
diff --git a/tests/auto/declarative/qmldebug/qmldebug.pro b/tests/auto/declarative/qmldebug/qmldebug.pro
new file mode 100644
index 0000000..61f821e
--- /dev/null
+++ b/tests/auto/declarative/qmldebug/qmldebug.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += network declarative
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qmldebug.cpp
diff --git a/tests/auto/declarative/qmldebug/tst_qmldebug.cpp b/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
new file mode 100644
index 0000000..a7573da
--- /dev/null
+++ b/tests/auto/declarative/qmldebug/tst_qmldebug.cpp
@@ -0,0 +1,594 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <qtest.h>
+#include <QSignalSpy>
+#include <QTimer>
+#include <QHostAddress>
+#include <QDebug>
+#include <QThread>
+#include <QProcessEnvironment>
+#include <QProcess>
+
+#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qmlcontext.h>
+#include <QtDeclarative/qmlcomponent.h>
+#include <QtDeclarative/qmlexpression.h>
+
+#include <private/qmldebug_p.h>
+#include <private/qmldebugclient_p.h>
+#include <private/qmldebugservice_p.h>
+#include <private/qmlgraphicsrectangle_p.h>
+#include <private/qmlgraphicstext_p.h>
+
+
+class tst_QmlDebug : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QmlDebug(QmlDebugConnection *conn, QmlEngine *engine, QmlGraphicsItem *rootItem)
+        : m_conn(conn), m_dbg(0), m_engine(engine), m_rootItem(rootItem) {}
+
+protected slots:
+    void saveValueChange(const QByteArray &ba, const QVariant &v)
+    {
+        m_savedValueChanges[ba] = v;
+    }
+
+private:
+    QmlDebugConnection *m_conn;
+    QmlEngineDebug *m_dbg;
+    QmlEngine *m_engine;
+    QmlGraphicsItem *m_rootItem;
+
+    QHash<QByteArray, QVariant> m_savedValueChanges;
+
+    void waitForQuery(QmlDebugQuery *query)
+    {
+        QCOMPARE(query->parent(), this);
+        QEventLoop loop;
+        QTimer timer;
+        QVERIFY(query->state() == QmlDebugQuery::Waiting);
+        connect(query, SIGNAL(stateChanged(State)), &loop, SLOT(quit()));
+        connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+        timer.start(5000);
+        loop.exec();
+        if (!timer.isActive())
+            QFAIL("query timed out");
+    }
+
+    void verifyRootObject(const QmlDebugObjectReference &obj)
+    {
+        // verifies object according to component definition in main()
+
+        QCOMPARE(obj.debugId(), QmlDebugService::idForObject(m_rootItem));
+        QCOMPARE(obj.className(), QLatin1String("Item"));
+        QCOMPARE(obj.name(), m_rootItem->objectName());
+        QCOMPARE(obj.contextDebugId(), QmlDebugService::idForObject(qmlContext(m_rootItem)));
+
+        QmlDebugFileReference source = obj.source();
+        QCOMPARE(source.url(), QUrl("file://"));
+        QCOMPARE(source.lineNumber(), 3);
+        QCOMPARE(source.columnNumber(), 3);
+
+        QList<QmlDebugPropertyReference> props = obj.properties();
+        QHash<QString, QVariant> expected;
+
+        expected["width"] = 10;
+        expected["height"] = 20;
+        verifyProperties(props, expected);
+    }
+    
+    void verifyProperties(const QList<QmlDebugPropertyReference> &actual, const QHash<QString, QVariant> &expected)
+    {
+        foreach(const QmlDebugPropertyReference &p, actual) {
+            if (expected.contains(p.name()))
+                QCOMPARE(p.value(), expected[p.name()]);
+        }
+    }
+
+    QmlDebugObjectReference findRootObject()
+    {
+        QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+        waitForQuery(q_engines);
+        
+        if (q_engines->engines().count() == 0)
+            return QmlDebugObjectReference();
+        QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+        waitForQuery(q_context);
+
+        if (q_context->rootContext().objects().count() == 0)
+            return QmlDebugObjectReference();
+        QmlDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
+        waitForQuery(q_obj);
+
+        QmlDebugObjectReference result = q_obj->object();
+
+        delete q_engines;
+        delete q_context;
+        delete q_obj;
+
+        return result;
+    }
+
+    QmlDebugPropertyReference findProperty(const QList<QmlDebugPropertyReference> &props, const QString &name)
+    {
+        foreach(const QmlDebugPropertyReference &p, props) {
+            if (p.name() == name)
+                return p;
+        }
+        return QmlDebugPropertyReference();
+    }
+
+    int countNotifiableProperties(const QObject *obj)
+    {
+        int count = 0;
+        for (int i=0; i<obj->metaObject()->propertyCount(); i++) {
+            QMetaProperty p = obj->metaObject()->property(i);
+            if (p.hasNotifySignal())
+                count++;
+        }
+        return count;
+    }
+
+private slots:
+    void initTestCase();
+
+    void watch_property();
+    void watch_object();
+    void watch_expression();
+    void watch_expression_data();
+
+    void queryAvailableEngines();
+    void queryRootContexts();
+    void queryObject();
+    void queryObjectRecursive();
+    void queryExpressionResult();
+    void queryExpressionResult_data();
+};
+
+void tst_QmlDebug::initTestCase()
+{
+    m_dbg = new QmlEngineDebug(m_conn, this);
+}
+
+void tst_QmlDebug::watch_property()
+{
+    QmlDebugObjectReference obj = findRootObject();
+    QmlDebugPropertyReference prop = findProperty(obj.properties(), "width");
+
+    QmlDebugPropertyWatch *watch = m_dbg->addWatch(prop, this);
+    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
+    QCOMPARE(watch->objectDebugId(), obj.debugId());
+    QCOMPARE(watch->name(), prop.name());
+
+    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
+    QEventLoop loop;
+    QTimer timer;
+    connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)), &loop, SLOT(quit()));
+    connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+
+    int origWidth = m_rootItem->property("width").toInt();
+    timer.start(5000);
+    m_rootItem->setProperty("width", origWidth*2);
+    loop.exec();
+
+    if (!timer.isActive())
+        QFAIL("Did not receive valueChanged() for property");
+
+    m_dbg->removeWatch(watch);
+    delete watch;
+
+    // restore original value and verify spy doesn't get a signal since watch has been removed
+    m_rootItem->setProperty("width", origWidth);
+    QTest::qWait(500);
+    QCOMPARE(spy.count(), 1);
+
+    QCOMPARE(spy.at(0).at(0).value<QByteArray>(), prop.name().toUtf8());
+    QCOMPARE(spy.at(0).at(1).value<QVariant>(), qVariantFromValue(origWidth*2));
+}
+
+void tst_QmlDebug::watch_object()
+{
+    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    
+    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+
+    QmlDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
+    waitForQuery(q_obj);
+
+    QmlDebugObjectReference obj = q_obj->object();
+
+    delete q_engines;
+    delete q_context;
+    delete q_obj;
+
+    QmlDebugWatch *watch = m_dbg->addWatch(obj, this);
+    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
+    QCOMPARE(watch->objectDebugId(), obj.debugId());
+
+    m_savedValueChanges.clear();
+    connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)),
+            SLOT(saveValueChange(QByteArray,QVariant)));
+
+    int origWidth = m_rootItem->property("width").toInt();
+    int origHeight = m_rootItem->property("height").toInt();
+    m_rootItem->setProperty("width", origWidth*2);
+    m_rootItem->setProperty("height", origHeight*2);
+
+    QEventLoop loop;
+    QTimer timer;
+    timer.start(5000);
+    while (timer.isActive() &&
+            (!m_savedValueChanges.contains("width") || !m_savedValueChanges.contains("height"))) {
+        loop.processEvents(QEventLoop::AllEvents, 50);
+    }
+
+    QVariant newWidth = m_savedValueChanges["width"];
+    QVariant newHeight = m_savedValueChanges["height"];
+
+    m_dbg->removeWatch(watch);
+    delete watch;
+
+    // since watch has been removed, restoring the original values should not trigger a valueChanged()
+    m_savedValueChanges.clear();
+    m_rootItem->setProperty("width", origWidth);
+    m_rootItem->setProperty("height", origHeight);
+    QTest::qWait(500);
+    QCOMPARE(m_savedValueChanges.count(), 0);
+
+    if (newWidth.isNull() || newHeight.isNull()) {
+        QString s = QString("Did not receive both width and height changes (width=%1, height=%2)")
+                .arg(newWidth.toString()).arg(newHeight.toString());
+        QFAIL(qPrintable(s));
+    }
+
+    QCOMPARE(newWidth, qVariantFromValue(origWidth*2));
+    QCOMPARE(newHeight, qVariantFromValue(origHeight*2));
+}
+
+void tst_QmlDebug::watch_expression()
+{
+    QFETCH(QString, expr);
+    QFETCH(int, increment);
+    QFETCH(int, incrementCount);
+
+    int origWidth = m_rootItem->property("width").toInt();
+    
+    QmlDebugObjectReference obj = findRootObject();
+    QmlDebugPropertyReference prop;
+
+    QmlDebugObjectExpressionWatch *watch = m_dbg->addWatch(obj, expr, this);
+    QCOMPARE(watch->state(), QmlDebugWatch::Waiting);
+    QCOMPARE(watch->objectDebugId(), obj.debugId());
+    QCOMPARE(watch->expression(), expr);
+
+    QSignalSpy spy(watch, SIGNAL(valueChanged(QByteArray,QVariant)));
+    int expectedSpyCount = incrementCount + 1;  // should also get signal with expression's initial value
+
+    int width = origWidth;
+    for (int i=0; i<incrementCount+1; i++) {
+        QTimer timer;
+        timer.start(5000);
+        if (i > 0) {
+            width += increment;
+            m_rootItem->setProperty("width", width);
+        }
+        QEventLoop loop;
+        connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
+        connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)), &loop, SLOT(quit()));
+        loop.exec();
+        if (!timer.isActive())
+            QFAIL("Did not receive valueChanged() signal for expression");
+    }
+
+    m_dbg->removeWatch(watch);
+    delete watch;
+
+    // restore original value and verify spy doesn't get a signal since watch has been removed
+    m_rootItem->setProperty("width", origWidth); // may increase spy count before QCOMPARE()
+    QTest::qWait(500);
+    QCOMPARE(spy.count(), expectedSpyCount);
+
+    width = origWidth + increment;
+    for (int i=0; i<spy.count(); i++) {
+        QCOMPARE(spy.at(i).at(1).value<QVariant>().toInt(), width);
+        width += increment;
+    }
+}
+
+void tst_QmlDebug::watch_expression_data()
+{
+    QTest::addColumn<QString>("expr");
+    QTest::addColumn<int>("increment");
+    QTest::addColumn<int>("incrementCount");
+
+    QTest::newRow("width") << "width" << 0 << 0;
+    QTest::newRow("width+10") << "width + 10" << 10 << 5;
+}
+
+void tst_QmlDebug::queryAvailableEngines()
+{
+    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+
+    // TODO have multiple engines
+    QList<QmlDebugEngineReference> engines = q_engines->engines();
+    QCOMPARE(engines.count(), 1);
+
+    foreach(const QmlDebugEngineReference &e, engines) {
+        QCOMPARE(e.debugId(), QmlDebugService::idForObject(m_engine));
+        QCOMPARE(e.name(), m_engine->objectName());
+    }
+
+    delete q_engines;
+}
+
+void tst_QmlDebug::queryRootContexts()
+{
+    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    
+    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+
+    QmlContext *actualContext = m_engine->rootContext();
+    QmlDebugContextReference context = q_context->rootContext();
+    QCOMPARE(context.debugId(), QmlDebugService::idForObject(actualContext));
+    QCOMPARE(context.name(), actualContext->objectName());
+
+    QCOMPARE(context.objects().count(), 1);
+
+    // root context query sends only root object data - it doesn't fill in
+    // the children or property info
+    QCOMPARE(context.objects()[0].properties().count(), 0);
+    QCOMPARE(context.objects()[0].children().count(), 0);
+
+    // TODO have multiple contexts
+    QCOMPARE(context.contexts().count(), 0);
+
+    delete q_engines;
+    delete q_context;
+}
+
+void tst_QmlDebug::queryObject()
+{
+    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    
+    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+
+    QmlDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[0], this);
+    waitForQuery(q_obj);
+
+    QmlDebugObjectReference obj = q_obj->object();
+    verifyRootObject(obj);
+
+    QVERIFY(obj.children().count() >= 2);
+
+    // non-recursive query, children data not available
+    foreach(const QmlDebugObjectReference &child, obj.children())
+        QCOMPARE(child.properties().count(), 0);
+
+    delete q_engines;
+    delete q_context;
+    delete q_obj;
+}
+
+void tst_QmlDebug::queryObjectRecursive()
+{
+    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    
+    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+
+    QmlDebugObjectQuery *q_obj = m_dbg->queryObjectRecursive(q_context->rootContext().objects()[0], this);
+    waitForQuery(q_obj);
+
+    QmlDebugObjectReference obj = q_obj->object();
+    verifyRootObject(obj);
+
+    delete q_engines;
+    delete q_context;
+    delete q_obj;
+
+    QList<QmlDebugObjectReference> children = obj.children();
+    QVERIFY(children.count() >= 2); // there may be additional properties e.g. StateGroup
+
+    QList<QmlDebugPropertyReference> props;
+    QHash<QString, QVariant> expected;
+
+    QmlDebugObjectReference rectRef;
+    QmlDebugObjectReference textRef;
+    foreach (const QmlDebugObjectReference &child, children) {
+        if (child.className() == "Rectangle") {
+            props = child.properties();
+            QVERIFY(props.count() > 0);
+            expected.clear();
+            expected["width"] = 500;
+            expected["height"] = 600;
+            expected["color"] = "blue";
+            verifyProperties(props, expected);
+            rectRef = child;
+        } else if (child.className() == "Text") {
+            props = child.properties();
+            QVERIFY(props.count() > 0);
+            expected.clear();
+            expected["color"] = "red";
+            verifyProperties(props, expected);
+            textRef = child;
+        }
+    }
+
+    QVERIFY(!rectRef.className().isEmpty());
+    QVERIFY(!textRef.className().isEmpty());
+
+    QObject *rectObj = 0;
+    QObject *textObj = 0;
+    foreach (QObject *o, m_rootItem->children()) {
+        if (o->metaObject()->className() == QmlGraphicsRectangle::staticMetaObject.className())
+            rectObj = o;
+        else if (o->metaObject()->className() == QmlGraphicsText::staticMetaObject.className())
+            textObj = o;
+    }
+
+    QVERIFY(rectObj);
+    QVERIFY(textObj);
+
+    for (int i=0; i<rectObj->metaObject()->propertyCount(); i++) {
+        QMetaProperty p = rectObj->metaObject()->property(i);
+        QmlDebugPropertyReference pd = findProperty(rectRef.properties(), p.name());
+        if (!pd.name().isEmpty()) {
+            QCOMPARE(pd.name(), QString::fromUtf8(p.name()));
+            if (p.type() < QVariant::UserType)
+                QCOMPARE(pd.value(), p.read(rectObj));
+            if (pd.name() != "parent")
+                QCOMPARE(pd.valueTypeName(), QString::fromUtf8(p.typeName()));
+            QCOMPARE(pd.hasNotifySignal(), p.hasNotifySignal());
+        }
+    }
+}
+
+void tst_QmlDebug::queryExpressionResult()
+{
+    QFETCH(QString, expr);
+    QFETCH(QVariant, result);
+
+    QmlDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+    
+    QmlDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+
+    QmlDebugExpressionQuery *q_expr = m_dbg->queryExpressionResult(q_context->rootContext().objects()[0].debugId(), expr, this);
+    QCOMPARE(q_expr->expression(), expr);
+    waitForQuery(q_expr);
+
+    QCOMPARE(q_expr->result(), result);
+
+    delete q_engines;
+    delete q_context;
+    delete q_expr;
+}
+
+void tst_QmlDebug::queryExpressionResult_data()
+{
+    QTest::addColumn<QString>("expr");
+    QTest::addColumn<QVariant>("result");
+
+    QTest::newRow("width + 50") << "width + 50" << qVariantFromValue(60);
+    QTest::newRow("blueRect.width") << "blueRect.width" << qVariantFromValue(500);
+    QTest::newRow("bad expr") << "aeaef" << qVariantFromValue(QString("<undefined>"));
+}
+
+
+class TestRunnerThread : public QThread
+{
+    Q_OBJECT
+public:
+    void run() {
+        QTest::qWait(1000);
+        connectToEngine();
+    }
+
+    QPointer<QmlEngine> m_engine;
+    QPointer<QmlGraphicsItem> m_item;
+
+signals:
+    void testsFinished();
+
+public slots:
+
+    void connectToEngine()
+    {
+        QmlDebugConnection conn;
+        conn.connectToHost("127.0.0.1", 3768);
+        bool ok = conn.waitForConnected(5000);
+        Q_ASSERT(ok);
+        while (!m_engine && !m_item)
+            QTest::qWait(50);
+
+        tst_QmlDebug test(&conn, m_engine, m_item);
+        QTest::qExec(&test); 
+        emit testsFinished();
+    }
+};
+
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    qputenv("QML_DEBUG_SERVER_PORT", "3768");
+
+    TestRunnerThread thread;
+    QObject::connect(&thread, SIGNAL(testsFinished()), qApp, SLOT(quit()));
+    thread.start();
+
+    QmlEngine engine;  // blocks until client connects
+
+    QmlComponent component(&engine,
+                "import Qt 4.6\n"
+                    "\n"                // don't remove, line number is tested
+                    "  Item {\n"        // don't remove spaces, column number is tested
+                        "width: 10; height: 20;\n"
+                        "Rectangle { id: blueRect; width: 500; height: 600; color: \"blue\"; }"
+                        "Text { color: \"red\"; }"
+                    "}\n",
+            QUrl("file://"));
+    Q_ASSERT(component.isReady());
+    QObject *o = component.create();
+    QObject::connect(&thread, SIGNAL(testsFinished()), o, SLOT(deleteLater()));
+
+    // start the test
+    thread.m_engine = &engine;
+    thread.m_item = qobject_cast<QmlGraphicsItem*>(o);
+
+    return app.exec();
+
+}
+
+//QTEST_MAIN(tst_QmlDebug)
+
+#include "tst_qmldebug.moc"
-- 
cgit v0.12


From 1424d6be3691bafc980693c01532938dc4a640a6 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Mon, 9 Nov 2009 13:27:49 +1000
Subject: Split out layout and positioner tests

Includes actually adding some layout tests (which seem to expose bugs
in the layouts).
---
 tests/auto/declarative/declarative.pro             |   1 +
 .../declarative/layouts/data/grid-animated.qml     |  55 ---
 .../auto/declarative/layouts/data/grid-spacing.qml |  40 --
 tests/auto/declarative/layouts/data/grid.qml       |  39 --
 .../layouts/data/horizontal-animated.qml           |  42 --
 .../layouts/data/horizontal-spacing.qml            |  27 --
 tests/auto/declarative/layouts/data/horizontal.qml |  26 --
 tests/auto/declarative/layouts/data/layouts.qml    |  34 ++
 tests/auto/declarative/layouts/data/repeater.qml   |  20 -
 .../declarative/layouts/data/vertical-animated.qml |  42 --
 .../declarative/layouts/data/vertical-spacing.qml  |  27 --
 tests/auto/declarative/layouts/data/vertical.qml   |  26 --
 tests/auto/declarative/layouts/tst_layouts.cpp     | 434 +++----------------
 .../qmlgraphicspositioners/data/grid-animated.qml  |  55 +++
 .../qmlgraphicspositioners/data/grid-spacing.qml   |  40 ++
 .../qmlgraphicspositioners/data/grid.qml           |  39 ++
 .../data/horizontal-animated.qml                   |  42 ++
 .../data/horizontal-spacing.qml                    |  27 ++
 .../qmlgraphicspositioners/data/horizontal.qml     |  26 ++
 .../qmlgraphicspositioners/data/repeater.qml       |  20 +
 .../data/vertical-animated.qml                     |  42 ++
 .../data/vertical-spacing.qml                      |  27 ++
 .../qmlgraphicspositioners/data/vertical.qml       |  26 ++
 .../qmlgraphicspositioners.pro                     |   7 +
 .../tst_qmlgraphicspositioners.cpp                 | 469 +++++++++++++++++++++
 25 files changed, 906 insertions(+), 727 deletions(-)
 delete mode 100644 tests/auto/declarative/layouts/data/grid-animated.qml
 delete mode 100644 tests/auto/declarative/layouts/data/grid-spacing.qml
 delete mode 100644 tests/auto/declarative/layouts/data/grid.qml
 delete mode 100644 tests/auto/declarative/layouts/data/horizontal-animated.qml
 delete mode 100644 tests/auto/declarative/layouts/data/horizontal-spacing.qml
 delete mode 100644 tests/auto/declarative/layouts/data/horizontal.qml
 create mode 100644 tests/auto/declarative/layouts/data/layouts.qml
 delete mode 100644 tests/auto/declarative/layouts/data/repeater.qml
 delete mode 100644 tests/auto/declarative/layouts/data/vertical-animated.qml
 delete mode 100644 tests/auto/declarative/layouts/data/vertical-spacing.qml
 delete mode 100644 tests/auto/declarative/layouts/data/vertical.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/grid.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro
 create mode 100644 tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 000ceb3..da46456 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -26,6 +26,7 @@ SUBDIRS += \
            qmlgraphicsitem \        # Cover
            qmlgraphicsborderimage \ # Cover
            qmlgraphicsparticles \   # Cover
+           qmlgraphicspositioners \ # Cover
            qmlgraphicstext \        # Cover
            qmlgraphicswebview \     # Cover
            qmlinfo \                # Cover
diff --git a/tests/auto/declarative/layouts/data/grid-animated.qml b/tests/auto/declarative/layouts/data/grid-animated.qml
deleted file mode 100644
index 6b128ce..0000000
--- a/tests/auto/declarative/layouts/data/grid-animated.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Grid {
-        columns: 3
-        add: Transition {
-            NumberAnimation {
-                matchProperties: "x,y"; from: -100
-            }
-        }
-        remove: Transition {
-            NumberAnimation {
-                matchProperties: "x,y"; to: -100
-            }
-        }
-        move: Transition {
-            NumberAnimation {
-                matchProperties: "x,y";
-            }
-        }
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            opacity: 0
-            color: "green"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            color: "blue"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "four"
-            color: "cyan"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "five"
-            color: "magenta"
-            width: 50
-            height: 50
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/data/grid-spacing.qml b/tests/auto/declarative/layouts/data/grid-spacing.qml
deleted file mode 100644
index 5b4a30d..0000000
--- a/tests/auto/declarative/layouts/data/grid-spacing.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Grid {
-        columns: 3
-        spacing: 4
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "green"
-            width: 20
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            color: "blue"
-            width: 50
-            height: 20
-        }
-        Rectangle {
-            objectName: "four"
-            color: "cyan"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "five"
-            color: "magenta"
-            width: 10
-            height: 10
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/data/grid.qml b/tests/auto/declarative/layouts/data/grid.qml
deleted file mode 100644
index 830df6a..0000000
--- a/tests/auto/declarative/layouts/data/grid.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Grid {
-        columns: 3
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "green"
-            width: 20
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            color: "blue"
-            width: 50
-            height: 20
-        }
-        Rectangle {
-            objectName: "four"
-            color: "cyan"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "five"
-            color: "magenta"
-            width: 10
-            height: 10
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/data/horizontal-animated.qml b/tests/auto/declarative/layouts/data/horizontal-animated.qml
deleted file mode 100644
index c29d6df..0000000
--- a/tests/auto/declarative/layouts/data/horizontal-animated.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Row {
-        add: Transition {
-            NumberAnimation {
-                matchProperties: "x"; from: -100
-            }
-        }
-        remove: Transition {
-            NumberAnimation {
-                matchProperties: "x"; to: -100
-            }
-        }
-        move: Transition {
-            NumberAnimation {
-                matchProperties: "x";
-            }
-        }
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "blue"
-            opacity: 0
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 50
-            height: 50
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/data/horizontal-spacing.qml b/tests/auto/declarative/layouts/data/horizontal-spacing.qml
deleted file mode 100644
index 32bf775..0000000
--- a/tests/auto/declarative/layouts/data/horizontal-spacing.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Row {
-        spacing: 10
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "red"
-            width: 20
-            height: 10
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 40
-            height: 20
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/data/horizontal.qml b/tests/auto/declarative/layouts/data/horizontal.qml
deleted file mode 100644
index 06ae151..0000000
--- a/tests/auto/declarative/layouts/data/horizontal.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Row {
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "red"
-            width: 20
-            height: 10
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 40
-            height: 20
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/data/layouts.qml b/tests/auto/declarative/layouts/data/layouts.qml
new file mode 100644
index 0000000..ccc8cfe
--- /dev/null
+++ b/tests/auto/declarative/layouts/data/layouts.qml
@@ -0,0 +1,34 @@
+import Qt 4.6
+
+Item {
+    id: resizable
+    width:300
+    height:300
+
+    GraphicsObjectContainer {
+        anchors.fill:parent
+
+        QGraphicsWidget {
+            size.width:parent.width
+            size.height:parent.height
+
+            layout: QGraphicsLinearLayout {
+                spacing: 0
+                LayoutItem {
+                    objectName: "left"
+                    minimumSize: "100x100"
+                    maximumSize: "300x300"
+                    preferredSize: "100x100"
+                    Rectangle { objectName: "yellowRect"; color: "yellow"; anchors.fill: parent }
+                }
+                LayoutItem {
+                    objectName: "right"
+                    minimumSize: "100x100"
+                    maximumSize: "400x400"
+                    preferredSize: "200x200"
+                    Rectangle { objectName: "greenRect"; color: "green"; anchors.fill: parent }
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/layouts/data/repeater.qml b/tests/auto/declarative/layouts/data/repeater.qml
deleted file mode 100644
index 2bc5e94..0000000
--- a/tests/auto/declarative/layouts/data/repeater.qml
+++ /dev/null
@@ -1,20 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Row {
-        Repeater{ model: 3;
-            delegate: Component {
-                Rectangle {
-                    color: "red"
-                    width: 50
-                    height: 50
-                    z: {if(index == 0){2;}else if(index == 1){1;} else{3;}}
-                    objectName: {if(index == 0){"one";}else if(index == 1){"two";} else{"three";}}
-
-                }
-            }
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/data/vertical-animated.qml b/tests/auto/declarative/layouts/data/vertical-animated.qml
deleted file mode 100644
index fcbc5f7..0000000
--- a/tests/auto/declarative/layouts/data/vertical-animated.qml
+++ /dev/null
@@ -1,42 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Column {
-        add: Transition {
-            NumberAnimation {
-                matchProperties: "y"; from: -100
-            }
-        }
-        remove: Transition {
-            NumberAnimation {
-                matchProperties: "y"; to: -100
-            }
-        }
-        move: Transition {
-            NumberAnimation {
-                matchProperties: "y";
-            }
-        }
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "blue"
-            opacity: 0
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 50
-            height: 50
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/data/vertical-spacing.qml b/tests/auto/declarative/layouts/data/vertical-spacing.qml
deleted file mode 100644
index 69a8256..0000000
--- a/tests/auto/declarative/layouts/data/vertical-spacing.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Column {
-        spacing: 10
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "red"
-            width: 20
-            height: 10
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 40
-            height: 20
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/data/vertical.qml b/tests/auto/declarative/layouts/data/vertical.qml
deleted file mode 100644
index 856c180..0000000
--- a/tests/auto/declarative/layouts/data/vertical.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-import Qt 4.6
-
-Item {
-    width: 640
-    height: 480
-    Column {
-        Rectangle {
-            objectName: "one"
-            color: "red"
-            width: 50
-            height: 50
-        }
-        Rectangle {
-            objectName: "two"
-            color: "red"
-            width: 20
-            height: 10
-        }
-        Rectangle {
-            objectName: "three"
-            color: "red"
-            width: 40
-            height: 20
-        }
-    }
-}
diff --git a/tests/auto/declarative/layouts/tst_layouts.cpp b/tests/auto/declarative/layouts/tst_layouts.cpp
index c0c067a..f619b57 100644
--- a/tests/auto/declarative/layouts/tst_layouts.cpp
+++ b/tests/auto/declarative/layouts/tst_layouts.cpp
@@ -41,7 +41,7 @@
 #include <QtTest/QtTest>
 #include <private/qlistmodelinterface_p.h>
 #include <qmlview.h>
-#include <private/qmlgraphicsrectangle_p.h>
+#include <private/qmlgraphicslayoutitem_p.h>
 #include <qmlexpression.h>
 
 class tst_QmlGraphicsLayouts : public QObject
@@ -51,17 +51,9 @@ public:
     tst_QmlGraphicsLayouts();
 
 private slots:
-    void test_horizontal();
-    void test_horizontal_spacing();
-    void test_horizontal_animated();
-    void test_vertical();
-    void test_vertical_spacing();
-    void test_vertical_animated();
-    void test_grid();
-    void test_grid_spacing();
-    void test_grid_animated();
+    void test_qml();//GraphicsLayout set up in Qml
+    void test_cpp();//GraphicsLayout set up in C++
 
-    void test_repeater();
 private:
     QmlView *createView(const QString &filename);
 };
@@ -70,385 +62,61 @@ tst_QmlGraphicsLayouts::tst_QmlGraphicsLayouts()
 {
 }
 
-void tst_QmlGraphicsLayouts::test_horizontal()
+void tst_QmlGraphicsLayouts::test_qml()
 {
-    QmlView *canvas = createView(SRCDIR "/data/horizontal.qml");
+    QmlView *canvas = createView(SRCDIR "/data/layouts.qml");
 
     canvas->execute();
     qApp->processEvents();
-
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 70.0);
-    QCOMPARE(three->y(), 0.0);
+    QmlGraphicsLayoutItem *left = qobject_cast<QmlGraphicsLayoutItem*>(canvas->root()->findChild<QmlGraphicsItem*>("left"));
+    QVERIFY(left != 0);
+
+    QmlGraphicsLayoutItem *right = qobject_cast<QmlGraphicsLayoutItem*>(canvas->root()->findChild<QmlGraphicsItem*>("right"));
+    QVERIFY(right != 0);
+
+    qreal gvMargin = 9.0;
+    //Preferred Size
+    canvas->root()->setWidth(300 + 2*gvMargin);
+    canvas->root()->setHeight(300 + 2*gvMargin);
+
+    QCOMPARE(left->x(), gvMargin);
+    QCOMPARE(left->y(), gvMargin);
+    QCOMPARE(left->width(), 100.0);
+    QCOMPARE(left->height(), 300.0);
+
+    QCOMPARE(right->x(), 100.0 + gvMargin);
+    QCOMPARE(right->y(), 0.0 + gvMargin);
+    QCOMPARE(right->width(), 200.0);
+    QCOMPARE(right->height(), 300.0);
+
+    //Minimum Size
+    canvas->root()->setWidth(10+2*gvMargin);
+    canvas->root()->setHeight(10+2*gvMargin);
+
+    QCOMPARE(left->x(), gvMargin);
+    QCOMPARE(left->width(), 100.0);
+    QCOMPARE(left->height(), 100.0);
+
+    QCOMPARE(right->x(), 100.0 + gvMargin);
+    QCOMPARE(right->width(), 100.0);
+    QCOMPARE(right->height(), 100.0);
+
+    //Maximum Size
+    canvas->root()->setWidth(1000 + 2*gvMargin);
+    canvas->root()->setHeight(1000 + 2*gvMargin);
+
+    QCOMPARE(left->x(), gvMargin);
+    QCOMPARE(left->width(), 300.0);
+    QCOMPARE(left->height(), 300.0);
+
+    QCOMPARE(right->x(), 300.0 + gvMargin);
+    QCOMPARE(right->width(), 400.0);
+    QCOMPARE(right->height(), 400.0);
 }
 
-void tst_QmlGraphicsLayouts::test_horizontal_spacing()
+void tst_QmlGraphicsLayouts::test_cpp()
 {
-    QmlView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
-
-    canvas->execute();
-    qApp->processEvents();
-
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 60.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 90.0);
-    QCOMPARE(three->y(), 0.0);
-}
-
-void tst_QmlGraphicsLayouts::test_horizontal_animated()
-{
-    QmlView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
-
-    canvas->execute();
-    qApp->processEvents();
-
-    QTest::qWait(0);//Let the animation start
-    //Note that one and three animate in
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-    QCOMPARE(one->x(), -100.0);
-
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-    QCOMPARE(two->x(), 0.0);
-
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-    QCOMPARE(three->x(), -100.0);
-
-    QTest::qWait(300);//Let the animation complete
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->opacity(), 0.0);
-    QCOMPARE(two->x(), 0.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 50.0);
-    QCOMPARE(three->y(), 0.0);
-
-    //Add 'two'
-    two->setOpacity(1.0);
-    QCOMPARE(two->opacity(), 1.0);
-    QTest::qWait(0);//Let the animation start
-    QCOMPARE(two->x(), -100.0);
-    QCOMPARE(three->x(), 50.0);
-    QTest::qWait(300);//Let the animation complete
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(three->x(), 100.0);
-
-    //Remove 'two'
-    two->setOpacity(0.0);
-    QCOMPARE(two->opacity(), 0.0);
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(three->x(), 100.0);
-    QTest::qWait(300);//Let the animation complete
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(three->x(), 50.0);
-}
-
-void tst_QmlGraphicsLayouts::test_vertical()
-{
-    QmlView *canvas = createView(SRCDIR "/data/vertical.qml");
-
-    canvas->execute();
-    qApp->processEvents();
-
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 0.0);
-    QCOMPARE(two->y(), 50.0);
-    QCOMPARE(three->x(), 0.0);
-    QCOMPARE(three->y(), 60.0);
-}
-
-void tst_QmlGraphicsLayouts::test_vertical_spacing()
-{
-    QmlView *canvas = createView(SRCDIR "/data/vertical-spacing.qml");
-
-    canvas->execute();
-    qApp->processEvents();
-
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 0.0);
-    QCOMPARE(two->y(), 60.0);
-    QCOMPARE(three->x(), 0.0);
-    QCOMPARE(three->y(), 80.0);
-}
-
-void tst_QmlGraphicsLayouts::test_vertical_animated()
-{
-    QmlView *canvas = createView(SRCDIR "/data/vertical-animated.qml");
-
-    canvas->execute();
-    qApp->processEvents();
-
-    QTest::qWait(0);//Let the animation start
-    //Note that one and three animate in
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-    QCOMPARE(one->y(), -100.0);
-
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-    QCOMPARE(two->y(), 0.0);
-
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-    QCOMPARE(three->y(), -100.0);
-
-    QTest::qWait(300);//Let the animation complete
-
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(two->opacity(), 0.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(two->x(), 0.0);
-    QCOMPARE(three->y(), 50.0);
-    QCOMPARE(three->x(), 0.0);
-
-    //Add 'two'
-    two->setOpacity(1.0);
-    QCOMPARE(two->opacity(), 1.0);
-    QTest::qWait(0);//Let the animation start
-    QCOMPARE(two->y(), -100.0);
-    QCOMPARE(three->y(), 50.0);
-    QTest::qWait(300);//Let the animation complete
-    QCOMPARE(two->y(), 50.0);
-    QCOMPARE(three->y(), 100.0);
-
-    //Remove 'two'
-    two->setOpacity(0.0);
-    QCOMPARE(two->opacity(), 0.0);
-    QCOMPARE(two->y(), 50.0);
-    QCOMPARE(three->y(), 100.0);
-    QTest::qWait(300);//Let the animation complete
-    QCOMPARE(two->y(), 50.0);
-    QCOMPARE(three->y(), 50.0);
-}
-
-void tst_QmlGraphicsLayouts::test_grid()
-{
-    QmlView *canvas = createView("data/grid.qml");
-
-    canvas->execute();
-    qApp->processEvents();
-
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-    QmlGraphicsRectangle *four = canvas->root()->findChild<QmlGraphicsRectangle*>("four");
-    QVERIFY(four != 0);
-    QmlGraphicsRectangle *five = canvas->root()->findChild<QmlGraphicsRectangle*>("five");
-    QVERIFY(five != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 70.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(four->x(), 0.0);
-    QCOMPARE(four->y(), 50.0);
-    QCOMPARE(five->x(), 50.0);
-    QCOMPARE(five->y(), 50.0);
-}
-
-void tst_QmlGraphicsLayouts::test_grid_spacing()
-{
-    QmlView *canvas = createView("data/grid-spacing.qml");
-
-    canvas->execute();
-    qApp->processEvents();
-
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-    QmlGraphicsRectangle *four = canvas->root()->findChild<QmlGraphicsRectangle*>("four");
-    QVERIFY(four != 0);
-    QmlGraphicsRectangle *five = canvas->root()->findChild<QmlGraphicsRectangle*>("five");
-    QVERIFY(five != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 54.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 78.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(four->x(), 0.0);
-    QCOMPARE(four->y(), 54.0);
-    QCOMPARE(five->x(), 54.0);
-    QCOMPARE(five->y(), 54.0);
-}
-
-void tst_QmlGraphicsLayouts::test_grid_animated()
-{
-    QmlView *canvas = createView(SRCDIR "/data/grid-animated.qml");
-    canvas->execute();
-    qApp->processEvents();
-
-    QTest::qWait(0);//Let the animation start
-    //Note that all but two animate in
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-    QCOMPARE(one->x(), -100.0);
-    QCOMPARE(one->y(), -100.0);
-
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-    QCOMPARE(two->x(), 0.0);
-    QCOMPARE(two->y(), 0.0);
-
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-    QCOMPARE(three->x(), -100.0);
-    QCOMPARE(three->y(), -100.0);
-
-    QmlGraphicsRectangle *four = canvas->root()->findChild<QmlGraphicsRectangle*>("four");
-    QVERIFY(four != 0);
-    QCOMPARE(four->x(), -100.0);
-    QCOMPARE(four->y(), -100.0);
-
-    QmlGraphicsRectangle *five = canvas->root()->findChild<QmlGraphicsRectangle*>("five");
-    QVERIFY(five != 0);
-    QCOMPARE(five->x(), -100.0);
-    QCOMPARE(five->y(), -100.0);
-
-    QTest::qWait(300);//Let the animation complete
-
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(two->opacity(), 0.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(two->x(), 0.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(three->x(), 50.0);
-    QCOMPARE(four->y(), 0.0);
-    QCOMPARE(four->x(), 100.0);
-    QCOMPARE(five->y(), 50.0);
-    QCOMPARE(five->x(), 0.0);
-
-    //Add 'two'
-    two->setOpacity(1.0);
-    QCOMPARE(two->opacity(), 1.0);
-    QTest::qWait(0);//Let the animation start
-    QCOMPARE(two->x(), -100.0);
-    QCOMPARE(two->y(), -100.0);
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(three->x(), 50.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(four->x(), 100.0);
-    QCOMPARE(four->y(), 0.0);
-    QCOMPARE(five->x(), 0.0);
-    QCOMPARE(five->y(), 50.0);
-    QTest::qWait(300);//Let the animation complete
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(three->x(), 100.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(four->x(), 0.0);
-    QCOMPARE(four->y(), 50.0);
-    QCOMPARE(five->x(), 50.0);
-    QCOMPARE(five->y(), 50.0);
-
-    //Remove 'two'
-    two->setOpacity(0.0);
-    QCOMPARE(two->opacity(), 0.0);
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(three->x(), 100.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(four->x(), 0.0);
-    QCOMPARE(four->y(), 50.0);
-    QCOMPARE(five->x(), 50.0);
-    QCOMPARE(five->y(), 50.0);
-    QTest::qWait(300);//Let the animation complete
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(three->x(), 50.0);
-    QCOMPARE(three->y(), 0.0);
-    QCOMPARE(four->x(), 100.0);
-    QCOMPARE(four->y(), 0.0);
-    QCOMPARE(five->x(), 0.0);
-    QCOMPARE(five->y(), 50.0);
-}
-
-void tst_QmlGraphicsLayouts::test_repeater()
-{
-    QmlView *canvas = createView("data/repeater.qml");
-
-    canvas->execute();
-    qApp->processEvents();
-
-    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
-    QVERIFY(one != 0);
-
-    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
-    QVERIFY(two != 0);
-
-    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
-    QVERIFY(three != 0);
-
-    QCOMPARE(one->x(), 0.0);
-    QCOMPARE(one->y(), 0.0);
-    QCOMPARE(two->x(), 50.0);
-    QCOMPARE(two->y(), 0.0);
-    QCOMPARE(three->x(), 100.0);
-    QCOMPARE(three->y(), 0.0);
+    //TODO: Waiting on QT-2407 to write this test
 }
 
 QmlView *tst_QmlGraphicsLayouts::createView(const QString &filename)
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml b/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml
new file mode 100644
index 0000000..6b128ce
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml
@@ -0,0 +1,55 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Grid {
+        columns: 3
+        add: Transition {
+            NumberAnimation {
+                matchProperties: "x,y"; from: -100
+            }
+        }
+        remove: Transition {
+            NumberAnimation {
+                matchProperties: "x,y"; to: -100
+            }
+        }
+        move: Transition {
+            NumberAnimation {
+                matchProperties: "x,y";
+            }
+        }
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            opacity: 0
+            color: "green"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 50
+            height: 50
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml b/tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml
new file mode 100644
index 0000000..5b4a30d
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/grid-spacing.qml
@@ -0,0 +1,40 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Grid {
+        columns: 3
+        spacing: 4
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid.qml b/tests/auto/declarative/qmlgraphicspositioners/data/grid.qml
new file mode 100644
index 0000000..830df6a
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/grid.qml
@@ -0,0 +1,39 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Grid {
+        columns: 3
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml b/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml
new file mode 100644
index 0000000..c29d6df
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-animated.qml
@@ -0,0 +1,42 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Row {
+        add: Transition {
+            NumberAnimation {
+                matchProperties: "x"; from: -100
+            }
+        }
+        remove: Transition {
+            NumberAnimation {
+                matchProperties: "x"; to: -100
+            }
+        }
+        move: Transition {
+            NumberAnimation {
+                matchProperties: "x";
+            }
+        }
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "blue"
+            opacity: 0
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 50
+            height: 50
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml b/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml
new file mode 100644
index 0000000..32bf775
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/horizontal-spacing.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Row {
+        spacing: 10
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml b/tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml
new file mode 100644
index 0000000..06ae151
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/horizontal.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Row {
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml b/tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml
new file mode 100644
index 0000000..2bc5e94
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/repeater.qml
@@ -0,0 +1,20 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Row {
+        Repeater{ model: 3;
+            delegate: Component {
+                Rectangle {
+                    color: "red"
+                    width: 50
+                    height: 50
+                    z: {if(index == 0){2;}else if(index == 1){1;} else{3;}}
+                    objectName: {if(index == 0){"one";}else if(index == 1){"two";} else{"three";}}
+
+                }
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml b/tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml
new file mode 100644
index 0000000..fcbc5f7
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/vertical-animated.qml
@@ -0,0 +1,42 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Column {
+        add: Transition {
+            NumberAnimation {
+                matchProperties: "y"; from: -100
+            }
+        }
+        remove: Transition {
+            NumberAnimation {
+                matchProperties: "y"; to: -100
+            }
+        }
+        move: Transition {
+            NumberAnimation {
+                matchProperties: "y";
+            }
+        }
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "blue"
+            opacity: 0
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 50
+            height: 50
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml b/tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml
new file mode 100644
index 0000000..69a8256
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/vertical-spacing.qml
@@ -0,0 +1,27 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Column {
+        spacing: 10
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml b/tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml
new file mode 100644
index 0000000..856c180
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/data/vertical.qml
@@ -0,0 +1,26 @@
+import Qt 4.6
+
+Item {
+    width: 640
+    height: 480
+    Column {
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "red"
+            width: 20
+            height: 10
+        }
+        Rectangle {
+            objectName: "three"
+            color: "red"
+            width: 40
+            height: 20
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro b/tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro
new file mode 100644
index 0000000..d151026
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/qmlgraphicspositioners.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qmlgraphicspositioners.cpp
+macx:CONFIG -= app_bundle
+
+# Define SRCDIR equal to test's source directory
+DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp b/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
new file mode 100644
index 0000000..aca3579
--- /dev/null
+++ b/tests/auto/declarative/qmlgraphicspositioners/tst_qmlgraphicspositioners.cpp
@@ -0,0 +1,469 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtTest/QtTest>
+#include <private/qlistmodelinterface_p.h>
+#include <qmlview.h>
+#include <private/qmlgraphicsrectangle_p.h>
+#include <qmlexpression.h>
+
+class tst_QmlGraphicsPositioners : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QmlGraphicsPositioners();
+
+private slots:
+    void test_horizontal();
+    void test_horizontal_spacing();
+    void test_horizontal_animated();
+    void test_vertical();
+    void test_vertical_spacing();
+    void test_vertical_animated();
+    void test_grid();
+    void test_grid_spacing();
+    void test_grid_animated();
+
+    void test_repeater();
+private:
+    QmlView *createView(const QString &filename);
+};
+
+tst_QmlGraphicsPositioners::tst_QmlGraphicsPositioners()
+{
+}
+
+void tst_QmlGraphicsPositioners::test_horizontal()
+{
+    QmlView *canvas = createView(SRCDIR "/data/horizontal.qml");
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 70.0);
+    QCOMPARE(three->y(), 0.0);
+}
+
+void tst_QmlGraphicsPositioners::test_horizontal_spacing()
+{
+    QmlView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 60.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 90.0);
+    QCOMPARE(three->y(), 0.0);
+}
+
+void tst_QmlGraphicsPositioners::test_horizontal_animated()
+{
+    QmlView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QTest::qWait(0);//Let the animation start
+    //Note that one and three animate in
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+    QCOMPARE(one->x(), -100.0);
+
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+    QCOMPARE(two->x(), 0.0);
+
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+    QCOMPARE(three->x(), -100.0);
+
+    QTest::qWait(300);//Let the animation complete
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->opacity(), 0.0);
+    QCOMPARE(two->x(), 0.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 0.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QCOMPARE(two->opacity(), 1.0);
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(three->x(), 50.0);
+    QTest::qWait(300);//Let the animation complete
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(three->x(), 100.0);
+
+    //Remove 'two'
+    two->setOpacity(0.0);
+    QCOMPARE(two->opacity(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(three->x(), 100.0);
+    QTest::qWait(300);//Let the animation complete
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(three->x(), 50.0);
+}
+
+void tst_QmlGraphicsPositioners::test_vertical()
+{
+    QmlView *canvas = createView(SRCDIR "/data/vertical.qml");
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 0.0);
+    QCOMPARE(two->y(), 50.0);
+    QCOMPARE(three->x(), 0.0);
+    QCOMPARE(three->y(), 60.0);
+}
+
+void tst_QmlGraphicsPositioners::test_vertical_spacing()
+{
+    QmlView *canvas = createView(SRCDIR "/data/vertical-spacing.qml");
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 0.0);
+    QCOMPARE(two->y(), 60.0);
+    QCOMPARE(three->x(), 0.0);
+    QCOMPARE(three->y(), 80.0);
+}
+
+void tst_QmlGraphicsPositioners::test_vertical_animated()
+{
+    QmlView *canvas = createView(SRCDIR "/data/vertical-animated.qml");
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QTest::qWait(0);//Let the animation start
+    //Note that one and three animate in
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+    QCOMPARE(one->y(), -100.0);
+
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+    QCOMPARE(two->y(), 0.0);
+
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+    QCOMPARE(three->y(), -100.0);
+
+    QTest::qWait(300);//Let the animation complete
+
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(two->opacity(), 0.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(two->x(), 0.0);
+    QCOMPARE(three->y(), 50.0);
+    QCOMPARE(three->x(), 0.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QCOMPARE(two->opacity(), 1.0);
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(two->y(), -100.0);
+    QCOMPARE(three->y(), 50.0);
+    QTest::qWait(300);//Let the animation complete
+    QCOMPARE(two->y(), 50.0);
+    QCOMPARE(three->y(), 100.0);
+
+    //Remove 'two'
+    two->setOpacity(0.0);
+    QCOMPARE(two->opacity(), 0.0);
+    QCOMPARE(two->y(), 50.0);
+    QCOMPARE(three->y(), 100.0);
+    QTest::qWait(300);//Let the animation complete
+    QCOMPARE(two->y(), 50.0);
+    QCOMPARE(three->y(), 50.0);
+}
+
+void tst_QmlGraphicsPositioners::test_grid()
+{
+    QmlView *canvas = createView("data/grid.qml");
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+    QmlGraphicsRectangle *four = canvas->root()->findChild<QmlGraphicsRectangle*>("four");
+    QVERIFY(four != 0);
+    QmlGraphicsRectangle *five = canvas->root()->findChild<QmlGraphicsRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 70.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 50.0);
+    QCOMPARE(five->x(), 50.0);
+    QCOMPARE(five->y(), 50.0);
+}
+
+void tst_QmlGraphicsPositioners::test_grid_spacing()
+{
+    QmlView *canvas = createView("data/grid-spacing.qml");
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+    QmlGraphicsRectangle *four = canvas->root()->findChild<QmlGraphicsRectangle*>("four");
+    QVERIFY(four != 0);
+    QmlGraphicsRectangle *five = canvas->root()->findChild<QmlGraphicsRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 54.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 78.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 54.0);
+    QCOMPARE(five->x(), 54.0);
+    QCOMPARE(five->y(), 54.0);
+}
+
+void tst_QmlGraphicsPositioners::test_grid_animated()
+{
+    QmlView *canvas = createView(SRCDIR "/data/grid-animated.qml");
+    canvas->execute();
+    qApp->processEvents();
+
+    QTest::qWait(0);//Let the animation start
+    //Note that all but two animate in
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+    QCOMPARE(one->x(), -100.0);
+    QCOMPARE(one->y(), -100.0);
+
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+    QCOMPARE(two->x(), 0.0);
+    QCOMPARE(two->y(), 0.0);
+
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+    QCOMPARE(three->x(), -100.0);
+    QCOMPARE(three->y(), -100.0);
+
+    QmlGraphicsRectangle *four = canvas->root()->findChild<QmlGraphicsRectangle*>("four");
+    QVERIFY(four != 0);
+    QCOMPARE(four->x(), -100.0);
+    QCOMPARE(four->y(), -100.0);
+
+    QmlGraphicsRectangle *five = canvas->root()->findChild<QmlGraphicsRectangle*>("five");
+    QVERIFY(five != 0);
+    QCOMPARE(five->x(), -100.0);
+    QCOMPARE(five->y(), -100.0);
+
+    QTest::qWait(300);//Let the animation complete
+
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(two->opacity(), 0.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(two->x(), 0.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(four->y(), 0.0);
+    QCOMPARE(four->x(), 100.0);
+    QCOMPARE(five->y(), 50.0);
+    QCOMPARE(five->x(), 0.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QCOMPARE(two->opacity(), 1.0);
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(two->y(), -100.0);
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 100.0);
+    QCOMPARE(four->y(), 0.0);
+    QCOMPARE(five->x(), 0.0);
+    QCOMPARE(five->y(), 50.0);
+    QTest::qWait(300);//Let the animation complete
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(three->x(), 100.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 50.0);
+    QCOMPARE(five->x(), 50.0);
+    QCOMPARE(five->y(), 50.0);
+
+    //Remove 'two'
+    two->setOpacity(0.0);
+    QCOMPARE(two->opacity(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(three->x(), 100.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 50.0);
+    QCOMPARE(five->x(), 50.0);
+    QCOMPARE(five->y(), 50.0);
+    QTest::qWait(300);//Let the animation complete
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 100.0);
+    QCOMPARE(four->y(), 0.0);
+    QCOMPARE(five->x(), 0.0);
+    QCOMPARE(five->y(), 50.0);
+}
+
+void tst_QmlGraphicsPositioners::test_repeater()
+{
+    QmlView *canvas = createView("data/repeater.qml");
+
+    canvas->execute();
+    qApp->processEvents();
+
+    QmlGraphicsRectangle *one = canvas->root()->findChild<QmlGraphicsRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QmlGraphicsRectangle *two = canvas->root()->findChild<QmlGraphicsRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QmlGraphicsRectangle *three = canvas->root()->findChild<QmlGraphicsRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 100.0);
+    QCOMPARE(three->y(), 0.0);
+}
+
+QmlView *tst_QmlGraphicsPositioners::createView(const QString &filename)
+{
+    QmlView *canvas = new QmlView(0);
+
+    QFile file(filename);
+    file.open(QFile::ReadOnly);
+    QString xml = file.readAll();
+    canvas->setQml(xml, filename);
+
+    return canvas;
+}
+
+
+QTEST_MAIN(tst_QmlGraphicsPositioners)
+
+#include "tst_qmlgraphicspositioners.moc"
-- 
cgit v0.12


From 604bcebbb3b37f5958b97c5178e4d2cb7cdef675 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Mon, 9 Nov 2009 13:44:47 +1000
Subject: Improve Doc

Task-number: QTBUG-5488
---
 .../graphicsitems/qmlgraphicstextinput.cpp         | 25 +++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
index e2b1725..cd7377e 100644
--- a/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicstextinput.cpp
@@ -252,10 +252,29 @@ void QmlGraphicsTextInput::setMaxLength(int ml)
 
 /*!
     \qmlproperty bool TextInput::cursorVisible
-    If true the text edit shows a cursor.
+    Set to true when the TextInput shows a cursor.
 
-    This property is set and unset when the line edit gets focus, but it can also
-    be set directly (useful, for example, if a KeyProxy might forward keys to it).
+    This property is set and unset when the TextInput gets focus, so that other
+    properties can be bound to whether the cursor is currently showing. As it
+    gets set and unset automatically, when you set the value yourself you must
+    keep in mind that your value may be overwritten.
+
+    It can be set directly in script, for example if a KeyProxy might
+    forward keys to it and you desire it to look active when this happens
+    (but without actually giving it the focus).
+
+    It should not be set directly on the element, like in the below QML,
+    as the specified value will be overridden an lost on focus changes.
+
+    \code
+    TextInput {
+        text: "Text"
+        cursorVisible: false
+    }
+    \endcode
+
+    In the above snippet the cursor will still become visible when the
+    TextInput gains focus.
 */
 bool QmlGraphicsTextInput::isCursorVisible() const
 {
-- 
cgit v0.12