Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Allow enum values to be used as signal parameters
  ListModel::clear() should not clear roles

1 files changed, 42 insertions, 0 deletions

diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 45072f3..2f7513f 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -106,6 +106,7 @@ private slots:
     void property_changes_data();
     void property_changes_worker();
     void property_changes_worker_data();
+    void clear();
 };
 int tst_qdeclarativelistmodel::roleFromName(const QDeclarativeListModel *model, const QString &roleName)
 {
@@ -1091,6 +1092,47 @@ void tst_qdeclarativelistmodel::property_changes_worker_data()
     property_changes_data();
 }
 
+void tst_qdeclarativelistmodel::clear()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeListModel model;
+    QDeclarativeEngine::setContextForObject(&model, engine.rootContext());
+    engine.rootContext()->setContextObject(&model);
+
+    QScriptEngine *seng = QDeclarativeEnginePrivate::getScriptEngine(&engine);
+    QScriptValue sv = seng->newObject();
+    QVariant result;
+
+    model.clear();
+    QCOMPARE(model.count(), 0);
+
+    sv.setProperty("propertyA", "value a");
+    sv.setProperty("propertyB", "value b");
+    model.append(sv);
+    QCOMPARE(model.count(), 1);
+
+    model.clear();
+    QCOMPARE(model.count(), 0);
+
+    model.append(sv);
+    model.append(sv);
+    QCOMPARE(model.count(), 2);
+
+    model.clear();
+    QCOMPARE(model.count(), 0);
+
+    // clearing does not remove the roles
+    sv.setProperty("propertyC", "value c");
+    model.append(sv);
+    QList<int> roles = model.roles();
+    model.clear();
+    QCOMPARE(model.count(), 0);
+    QCOMPARE(model.roles(), roles);
+    QCOMPARE(model.toString(roles[0]), QString("propertyA"));
+    QCOMPARE(model.toString(roles[1]), QString("propertyB"));
+    QCOMPARE(model.toString(roles[2]), QString("propertyC"));
+}
+
 QTEST_MAIN(tst_qdeclarativelistmodel)
 
 #include "tst_qdeclarativelistmodel.moc"