Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

5 files changed, 91 insertions, 6 deletions

diff --git a/tests/auto/declarative/pathview/tst_pathview.cpp b/tests/auto/declarative/pathview/tst_pathview.cpp
index 57ae8c0..360228b 100644
--- a/tests/auto/declarative/pathview/tst_pathview.cpp
+++ b/tests/auto/declarative/pathview/tst_pathview.cpp
@@ -111,6 +111,14 @@ public:
         return returnHash;
     }
 
+    QVariant data(int index, int role) const {
+        if (role == 0)
+            return list.at(index).first;
+        if (role == 1)
+            return list.at(index).second;
+        return QVariant();
+    }
+
     void addItem(const QString &name, const QString &number) {
         list.append(QPair<QString,QString>(name, number));
         emit itemsInserted(list.count()-1, 1);
diff --git a/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml b/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml
index 2edc0bd..4b5bea6 100644
--- a/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml
+++ b/tests/auto/declarative/qmlgraphicslistview/data/listview-sections.qml
@@ -54,6 +54,6 @@ Rectangle {
         height: 320
         model: testModel
         delegate: myDelegate
-        sectionExpression: "Math.floor(number/5)"
+        section.property: "number"
     }
 }
diff --git a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
index 7b5cfc0..87d4649 100644
--- a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
+++ b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp
@@ -160,6 +160,14 @@ public:
         }
     }
 
+    QVariant data(int index, int role) const
+    {
+        if (role==0)
+            return list.at(index).first;
+        if (role==1)
+            return list.at(index).second;
+        return QVariant();
+    }
     QHash<int, QVariant> data(int index, const QList<int> &roles) const {
         QHash<int,QVariant> returnHash;
 
@@ -892,8 +900,6 @@ void tst_QmlGraphicsListView::sections()
     QmlGraphicsItem *viewport = listview->viewport();
     QVERIFY(viewport != 0);
 
-    QCOMPARE(listview->sectionExpression(), QLatin1String("Math.floor(number/5)"));
-
     // Confirm items positioned correctly
     int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count();
     for (int i = 0; i < model.count() && i < itemCount; ++i) {
diff --git a/tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp b/tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp
index bfffc43..43c64cd 100644
--- a/tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp
+++ b/tests/auto/declarative/qmlinstruction/tst_qmlinstruction.cpp
@@ -388,7 +388,7 @@ void tst_qmlinstruction::dump()
     {
         QmlInstruction i;
         i.line = 34;
-        i.type = QmlInstruction::StoreObjPropBinding;
+        //i.type = QmlInstruction::StoreObjPropBinding; // removed!
         i.assignObjPropBinding.property = 28;
         i.assignObjPropBinding.contextIdx = 3;
         i.assignObjPropBinding.context = 7;
diff --git a/tests/benchmarks/declarative/text/tst_text.cpp b/tests/benchmarks/declarative/text/tst_text.cpp
index e69ecd8..c7ea884 100644
--- a/tests/benchmarks/declarative/text/tst_text.cpp
+++ b/tests/benchmarks/declarative/text/tst_text.cpp
@@ -62,6 +62,11 @@ private slots:
     void document();
     void paintDocToPixmap();
     void paintDocToPixmap_painterFill();
+    void control();
+    void paintControlToPixmap();
+    void paintControlToPixmap_painterFill();
+    void constructControl();
+    void constructDocument();
 
 private:
     QString m_text;
@@ -144,6 +149,48 @@ void tst_text::paintLayoutToPixmap_painterFill()
 
 void tst_text::document()
 {
+    QTextDocument *doc = new QTextDocument;
+
+    QBENCHMARK {
+        QTextDocument *doc = new QTextDocument;
+        doc->setHtml(m_text);
+    }
+}
+
+void tst_text::paintDocToPixmap()
+{
+    QTextDocument *doc = new QTextDocument;
+    doc->setHtml(m_text);
+    doc->setTextWidth(300);
+    QSize size = doc->size().toSize();
+
+    QBENCHMARK {
+        QPixmap img(size);
+        img.fill(Qt::transparent);
+        QPainter p(&img);
+        doc->drawContents(&p/*, QRectF(QPointF(0, 0), QSizeF(size))*/);
+    }
+}
+
+void tst_text::paintDocToPixmap_painterFill()
+{
+    QTextDocument *doc = new QTextDocument;
+    doc->setHtml(m_text);
+    doc->setTextWidth(300);
+    QSize size = doc->size().toSize();
+
+    QBENCHMARK {
+        QPixmap img(size);
+        QPainter p(&img);
+        p.setCompositionMode(QPainter::CompositionMode_Source);
+        p.fillRect(0, 0, img.width(), img.height(), Qt::transparent);
+        p.setCompositionMode(QPainter::CompositionMode_SourceOver);
+        doc->drawContents(&p/*, QRectF(QPointF(0, 0), QSizeF(size))*/);
+    }
+}
+
+void tst_text::control()
+{
     QTextControl *control = new QTextControl(m_text);
 
     QBENCHMARK {
@@ -153,11 +200,12 @@ void tst_text::document()
     }
 }
 
-void tst_text::paintDocToPixmap()
+void tst_text::paintControlToPixmap()
 {
     QTextControl *control = new QTextControl;
     QTextDocument *doc = control->document();
     doc->setHtml(m_text);
+    doc->setTextWidth(300);
     QSize size = doc->size().toSize();
 
     QBENCHMARK {
@@ -168,11 +216,12 @@ void tst_text::paintDocToPixmap()
     }
 }
 
-void tst_text::paintDocToPixmap_painterFill()
+void tst_text::paintControlToPixmap_painterFill()
 {
     QTextControl *control = new QTextControl;
     QTextDocument *doc = control->document();
     doc->setHtml(m_text);
+    doc->setTextWidth(300);
     QSize size = doc->size().toSize();
 
     QBENCHMARK {
@@ -185,5 +234,27 @@ void tst_text::paintDocToPixmap_painterFill()
     }
 }
 
+void tst_text::constructControl()
+{
+    QTextControl *control = new QTextControl;
+    delete control;
+
+    QBENCHMARK {
+        QTextControl *control = new QTextControl;
+        delete control;
+    }
+}
+
+void tst_text::constructDocument()
+{
+    QTextDocument *doc = new QTextDocument;
+    delete doc;
+
+    QBENCHMARK {
+        QTextDocument *doc = new QTextDocument;
+        delete doc;
+    }
+}
+
 QTEST_MAIN(tst_text)
 #include "tst_text.moc"