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

4 files changed, 18 insertions, 4 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;