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

13 files changed, 179 insertions, 155 deletions

diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 06ff47c..5dc3858 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -825,7 +825,9 @@ bool QDeclarativeCompiler::buildObject(Object *obj, const BindingContext &ctxt)
     if (isCustomParser && !customProps.isEmpty()) {
         QDeclarativeCustomParser *cp = output->types.at(obj->type).type->customParser();
         cp->clearErrors();
+        cp->compiler = this;
         obj->custom = cp->compile(customProps);
+        cp->compiler = 0;
         foreach (QDeclarativeError err, cp->errors()) {
             err.setUrl(output->url);
             exceptions << err;
@@ -2184,6 +2186,27 @@ bool QDeclarativeCompiler::testQualifiedEnumAssignment(const QMetaProperty &prop
     return true;
 }
 
+// Similar logic to above, but not knowing target property.
+int QDeclarativeCompiler::evaluateEnum(const QByteArray& script) const
+{
+    int dot = script.find('.');
+    if (dot > 0) {
+        QDeclarativeType *type = 0;
+        QDeclarativeEnginePrivate::get(engine)->resolveType(unit->imports, script.left(dot), &type, 0, 0, 0, 0);
+        if (!type)
+            return -1;
+        const QMetaObject *mo = type->metaObject();
+        const char *key = script.constData() + dot+1;
+        int i = mo->enumeratorCount();
+        while (i--) {
+            int v = mo->enumerator(i).keyToValue(key);
+            if (v >= 0)
+                return v;
+        }
+    }
+    return -1;
+}
+
 // Ensures that the dynamic meta specification on obj is valid
 bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj)
 {
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index 05b556e..a81259b 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -161,6 +161,8 @@ public:
 
     static QMetaMethod findSignalByName(const QMetaObject *, const QByteArray &name);
 
+    int evaluateEnum(const QByteArray& script) const; // for QDeclarativeCustomParser::evaluateEnum
+
 private:
     static void reset(QDeclarativeCompiledData *);
 
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp
index 67f0963..a3a511c 100644
--- a/src/declarative/qml/qdeclarativecustomparser.cpp
+++ b/src/declarative/qml/qdeclarativecustomparser.cpp
@@ -43,6 +43,7 @@
 #include "qdeclarativecustomparser_p_p.h"
 
 #include "qdeclarativeparser_p.h"
+#include "qdeclarativecompiler_p.h"
 
 #include <QtCore/qdebug.h>
 
@@ -260,4 +261,15 @@ void QDeclarativeCustomParser::error(const QDeclarativeCustomParserNode& node, c
     exceptions << error;
 }
 
+/*!
+    If \a script is a simply enum expression (eg. Text.AlignLeft),
+    returns the integer equivalent (eg. 1).
+
+    Otherwise, returns -1.
+*/
+int QDeclarativeCustomParser::evaluateEnum(const QByteArray& script) const
+{
+    return compiler->evaluateEnum(script);
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
index 39bd43c..f9bf513 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -66,6 +66,8 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class QDeclarativeCompiler;
+
 class QDeclarativeCustomParserPropertyPrivate;
 class Q_DECLARATIVE_EXPORT QDeclarativeCustomParserProperty
 {
@@ -111,6 +113,7 @@ private:
 class Q_DECLARATIVE_EXPORT QDeclarativeCustomParser
 {
 public:
+    QDeclarativeCustomParser() : compiler(0) {}
     virtual ~QDeclarativeCustomParser() {}
 
     void clearErrors();
@@ -124,8 +127,12 @@ protected:
     void error(const QDeclarativeCustomParserProperty&, const QString& description);
     void error(const QDeclarativeCustomParserNode&, const QString& description);
 
+    int evaluateEnum(const QByteArray&) const;
+
 private:
     QList<QDeclarativeError> exceptions;
+    QDeclarativeCompiler *compiler;
+    friend class QDeclarativeCompiler;
 };
 
 #if 0
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 45a3cf7..5b0a7ea 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -94,9 +94,12 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
     }
     \endcode
 
-    Roles (properties) must begin with a lower-case letter.  The above example defines a
+    Roles (properties) must begin with a lower-case letter.The above example defines a
     ListModel containing three elements, with the roles "name" and "cost".
 
+    Values must be simple constants - either strings (quoted), bools (true, false), numbers,
+    or enum values (like Text.AlignHCenter).
+
     The defined model can be used in views such as ListView:
     \code
     Component {
@@ -167,6 +170,8 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
     }
     \endcode
 
+    \section2 Modifying list models
+
     The content of a ListModel may be created and modified using the clear(),
     append(), and set() methods.  For example:
 
@@ -676,10 +681,17 @@ bool QDeclarativeListModelParser::compileProperty(const QDeclarativeCustomParser
                 d += char(variant.asBoolean());
             } else if (variant.isScript()) {
                 if (definesEmptyList(variant.asScript())) {
-                    d[0] = 0; // QDeclarativeParser::Variant::Invalid - marks empty list
+                    d[0] = char(QDeclarativeParser::Variant::Invalid); // marks empty list
                 } else {
-                    error(prop, QDeclarativeListModel::tr("ListElement: cannot use script for property value"));
-                    return false;
+                    QByteArray script = variant.asScript().toUtf8();
+                    int v = evaluateEnum(script);
+                    if (v<0) {
+                        error(prop, QDeclarativeListModel::tr("ListElement: cannot use script for property value"));
+                        return false;
+                    } else {
+                        d[0] = char(QDeclarativeParser::Variant::Number);
+                        d += QByteArray::number(v);
+                    }
                 }
             }
             d.append('\0');
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 78e5912..576fe21 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 #include <qtest.h>
 #include <QtDeclarative/private/qdeclarativeitem_p.h>
+#include <QtDeclarative/private/qdeclarativetext_p.h>
 #include <QtDeclarative/private/qdeclarativelistmodel_p.h>
 #include <QtDeclarative/private/qdeclarativeexpression_p.h>
 #include <QDeclarativeComponent>
@@ -459,7 +460,7 @@ void tst_QDeclarativeListModel::static_types_data()
 
     QTest::newRow("enum")
         << "ListElement { foo: Text.AlignHCenter }"
-        << QVariant("QTBUG-5974:ListElement: constant script support for property value");
+        << QVariant(double(QDeclarativeText::AlignHCenter));
 }
 
 void tst_QDeclarativeListModel::static_types()
@@ -516,7 +517,7 @@ void tst_QDeclarativeListModel::error_data()
 
     QTest::newRow("bindings not allowed in ListElement")
         << "import Qt 4.6\nRectangle { id: rect; ListModel { ListElement { foo: rect.color } } }"
-        << "ListElement: cannot use script for property value"; // but note QTBUG-5974
+        << "ListElement: cannot use script for property value";
 
     QTest::newRow("random object list properties allowed in ListElement")
         << "import Qt 4.6\nListModel { ListElement { foo: [ ListElement { bar: 123 } ] } }"
diff --git a/tests/benchmarks/declarative/binding/testtypes.cpp b/tests/benchmarks/declarative/binding/testtypes.cpp
index 043c8ab..1fc9ccd 100644
--- a/tests/benchmarks/declarative/binding/testtypes.cpp
+++ b/tests/benchmarks/declarative/binding/testtypes.cpp
@@ -42,5 +42,5 @@
 
 void registerTypes()
 {
-    QML_REGISTER_TYPE(Test, 1, 0, MyQmlObject, MyQmlObject);
+    qmlRegisterType<MyQmlObject>("Test", 1, 0, "MyQmlObject");
 }
diff --git a/tests/benchmarks/declarative/creation/tst_creation.cpp b/tests/benchmarks/declarative/creation/tst_creation.cpp
index cd69cfe..7aec32a 100644
--- a/tests/benchmarks/declarative/creation/tst_creation.cpp
+++ b/tests/benchmarks/declarative/creation/tst_creation.cpp
@@ -60,7 +60,7 @@ class tst_creation : public QObject
 {
     Q_OBJECT
 public:
-    tst_creation() {}
+    tst_creation();
 
 private slots:
     void qobject_cpp();
@@ -68,15 +68,11 @@ private slots:
     void qobject_qmltype();
     void qobject_alloc();
 
-    void qdeclarativecontext();
+    void qobject_10flat_qml();
+    void qobject_10flat_cpp();
 
-    void objects_qmltype_data();
-    void objects_qmltype();
-
-    void qgraphicsitem();
-    void qgraphicsobject();
-    void qgraphicsitem14();
-    void qgraphicsitem_tree14();
+    void qobject_10tree_qml();
+    void qobject_10tree_cpp();
 
     void itemtree_notree_cpp();
     void itemtree_objtree_cpp();
@@ -85,10 +81,36 @@ private slots:
     void itemtree_qml();
     void itemtree_scene_cpp();
 
+    void elements_data();
+    void elements();
+
 private:
     QDeclarativeEngine engine;
 };
 
+class TestType : public QObject
+{
+Q_OBJECT
+Q_PROPERTY(QDeclarativeListProperty<QObject> resources READ resources);
+Q_CLASSINFO("DefaultProperty", "resources");
+public:
+    TestType(QObject *parent = 0)
+    : QObject(parent) {}
+
+    QDeclarativeListProperty<QObject> resources() { 
+        return QDeclarativeListProperty<QObject>(this, 0, resources_append); 
+    }
+
+    static void resources_append(QDeclarativeListProperty<QObject> *p, QObject *o) {
+        o->setParent(p->object);
+    }
+};
+
+tst_creation::tst_creation() 
+{
+    qmlRegisterType<TestType>("Qt.test", 1, 0, "TestType");
+}
+
 inline QUrl TEST_FILE(const QString &filename)
 {
     return QUrl::fromLocalFile(QLatin1String(SRCDIR) + QLatin1String("/data/") + filename);
@@ -115,68 +137,73 @@ void tst_creation::qobject_qml()
     }
 }
 
-void tst_creation::qobject_qmltype()
+void tst_creation::qobject_10flat_qml()
 {
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/QtObject", 4, 6);
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt.test 1.0\nTestType { resources: [ TestType{},TestType{},TestType{},TestType{},TestType{},TestType{},TestType{},TestType{},TestType{},TestType{} ] }", QUrl());
+    QObject *obj = component.create();
+    delete obj;
 
     QBENCHMARK {
-        QObject *obj = t->create();
+        QObject *obj = component.create();
         delete obj;
     }
 }
 
-struct QObjectFakeData {
-    char data[sizeof(QObjectPrivate)];
-};
-
-struct QObjectFake {
-    QObjectFake();
-    virtual ~QObjectFake();
-private:
-    QObjectFakeData *d;
-};
-
-QObjectFake::QObjectFake()
+void tst_creation::qobject_10flat_cpp()
 {
-    d = new QObjectFakeData;
+    QBENCHMARK {
+        QObject *item = new TestType;
+        new TestType(item);
+        new TestType(item);
+        new TestType(item);
+        new TestType(item);
+        new TestType(item);
+        new TestType(item);
+        new TestType(item);
+        new TestType(item);
+        new TestType(item);
+        new TestType(item);
+        delete item;
+    }
 }
 
-QObjectFake::~QObjectFake()
+void tst_creation::qobject_10tree_qml()
 {
-    delete d;
-}
+    QDeclarativeComponent component(&engine);
+    component.setData("import Qt.test 1.0\nTestType { TestType{ TestType { TestType{ TestType{ TestType{ TestType{ TestType{ TestType{ TestType{ TestType{ } } } } } } } } } } }", QUrl());
+
+    QObject *obj = component.create();
+    delete obj;
 
-void tst_creation::qobject_alloc()
-{
     QBENCHMARK {
-        QObjectFake *obj = new QObjectFake;
+        QObject *obj = component.create();
         delete obj;
     }
 }
 
-void tst_creation::qdeclarativecontext()
+void tst_creation::qobject_10tree_cpp()
 {
     QBENCHMARK {
-        QDeclarativeContext *ctxt = new QDeclarativeContext(&engine);
-        delete ctxt;
+        QObject *item = new TestType;
+        QObject *root = item;
+        item = new TestType(item);
+        item = new TestType(item);
+        item = new TestType(item);
+        item = new TestType(item);
+        item = new TestType(item);
+        item = new TestType(item);
+        item = new TestType(item);
+        item = new TestType(item);
+        item = new TestType(item);
+        item = new TestType(item);
+        delete root;
     }
 }
 
-void tst_creation::objects_qmltype_data()
-{
-    QTest::addColumn<QByteArray>("type");
-
-    QList<QByteArray> types = QDeclarativeMetaType::qmlTypeNames();
-    foreach (QByteArray type, types)
-        QTest::newRow(type.constData()) << type;
-}
-
-void tst_creation::objects_qmltype()
+void tst_creation::qobject_qmltype()
 {
-    QFETCH(QByteArray, type);
-    QDeclarativeType *t = QDeclarativeMetaType::qmlType(type, 4, 6);
-    if (!t || !t->isCreatable())
-        QSKIP("Non-creatable type", SkipSingle);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType("Qt/QtObject", 4, 6);
 
     QBENCHMARK {
         QObject *obj = t->create();
@@ -184,114 +211,32 @@ void tst_creation::objects_qmltype()
     }
 }
 
-class QGraphicsItemDummy : public QGraphicsItem
-{
-public:
-    virtual QRectF boundingRect() const { return QRectF(); }
-    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}
+struct QObjectFakeData {
+    char data[sizeof(QObjectPrivate)];
 };
 
-class QGraphicsObjectDummy : public QGraphicsObject
-{
-public:
-    virtual QRectF boundingRect() const { return QRectF(); }
-    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) {}
+struct QObjectFake {
+    QObjectFake();
+    virtual ~QObjectFake();
+private:
+    QObjectFakeData *d;
 };
 
-void tst_creation::qgraphicsitem()
-{
-    QBENCHMARK {
-        QGraphicsItemDummy *i = new QGraphicsItemDummy();
-        delete i;
-    }
-}
-
-void tst_creation::qgraphicsobject()
+QObjectFake::QObjectFake()
 {
-    QBENCHMARK {
-        QGraphicsObjectDummy *i = new QGraphicsObjectDummy();
-        delete i;
-    }
+    d = new QObjectFakeData;
 }
 
-void tst_creation::qgraphicsitem14()
+QObjectFake::~QObjectFake()
 {
-    QBENCHMARK {
-        QGraphicsItemDummy *i1 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i2 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i3 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i4 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i5 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i6 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i7 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i8 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i9 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i10 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i11 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i12 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i13 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i14 = new QGraphicsItemDummy();
-
-        delete i1;
-        delete i2;
-        delete i3;
-        delete i4;
-        delete i5;
-        delete i6;
-        delete i7;
-        delete i8;
-        delete i9;
-        delete i10;
-        delete i11;
-        delete i12;
-        delete i13;
-        delete i14;
-    }
+    delete d;
 }
 
-void tst_creation::qgraphicsitem_tree14()
+void tst_creation::qobject_alloc()
 {
     QBENCHMARK {
-        // i1
-        // +-------------------------+
-        // i2                        i3
-        // +-----------+       +-----+-----+
-        // i4          i5      i6          i7
-        // +----+   +--+    +--+--+        +----+
-        // i8   i9  i10   i11     i12      i13  i14
-
-        QGraphicsItemDummy *i1 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i2 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i3 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i4 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i5 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i6 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i7 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i8 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i9 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i10 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i11 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i12 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i13 = new QGraphicsItemDummy();
-        QGraphicsItemDummy *i14 = new QGraphicsItemDummy();
-
-        i14->setParentItem(i7);
-        i13->setParentItem(i7);
-        i12->setParentItem(i6);
-        i11->setParentItem(i6);
-        i10->setParentItem(i5);
-        i9->setParentItem(i4);
-        i8->setParentItem(i4);
-
-        i7->setParentItem(i3);
-        i6->setParentItem(i3);
-        i5->setParentItem(i2);
-        i4->setParentItem(i2);
-
-        i3->setParentItem(i1);
-        i2->setParentItem(i1);
-
-        delete i1;
+        QObjectFake *obj = new QObjectFake;
+        delete obj;
     }
 }
 
@@ -390,6 +335,27 @@ void tst_creation::itemtree_scene_cpp()
     delete root;
 }
 
+void tst_creation::elements_data()
+{
+    QTest::addColumn<QByteArray>("type");
+
+    QList<QByteArray> types = QDeclarativeMetaType::qmlTypeNames();
+    foreach (QByteArray type, types)
+        QTest::newRow(type.constData()) << type;
+}
+
+void tst_creation::elements()
+{
+    QFETCH(QByteArray, type);
+    QDeclarativeType *t = QDeclarativeMetaType::qmlType(type, 4, 6);
+    if (!t || !t->isCreatable())
+        QSKIP("Non-creatable type", SkipSingle);
+
+    QBENCHMARK {
+        QObject *obj = t->create();
+        delete obj;
+    }
+}
 
 QTEST_MAIN(tst_creation)
 
diff --git a/tests/benchmarks/declarative/declarative.pro b/tests/benchmarks/declarative/declarative.pro
index 8c0ed42..38ea6c4 100644
--- a/tests/benchmarks/declarative/declarative.pro
+++ b/tests/benchmarks/declarative/declarative.pro
@@ -2,9 +2,10 @@ TEMPLATE = subdirs
 SUBDIRS += \
            binding \
            creation \
+           painting \
            pointers \
            qdeclarativecomponent \
            qdeclarativeimage \
            qdeclarativemetaproperty \
            script \
-#           qdeclarativetime
+           qdeclarativetime
diff --git a/tests/benchmarks/declarative/painting/paintbenchmark.pro b/tests/benchmarks/declarative/painting/painting.pro
index 2f98e8b..2f98e8b 100644
--- a/tests/benchmarks/declarative/painting/paintbenchmark.pro
+++ b/tests/benchmarks/declarative/painting/painting.pro
diff --git a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
index acdc395..7bc6ca2 100644
--- a/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
+++ b/tests/benchmarks/declarative/qdeclarativecomponent/testtypes.cpp
@@ -42,5 +42,5 @@
 
 void registerTypes()
 {
-    QML_REGISTER_TYPE(Qt.test, 4, 6, MyQmlObject, MyQmlObject);
+    qmlRegisterType<MyQmlObject>("Qt.test", 4, 6, "MyQmlObject");
 }
diff --git a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp b/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
index a924337..20f0d93d 100644
--- a/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
+++ b/tests/benchmarks/declarative/qdeclarativetime/qdeclarativetime.cpp
@@ -156,7 +156,7 @@ int main(int argc, char ** argv)
 {
     QApplication app(argc, argv);
 
-    QML_REGISTER_TYPE(QDeclarativeTime, 1, 0, Timer, Timer);
+    qmlRegisterType<Timer>("QDeclarativeTime", 1, 0, "Timer");
 
     uint iterations = 1024;
     QString filename;
diff --git a/tests/benchmarks/declarative/script/tst_script.cpp b/tests/benchmarks/declarative/script/tst_script.cpp
index 9dd4076..8ea6dcd 100644
--- a/tests/benchmarks/declarative/script/tst_script.cpp
+++ b/tests/benchmarks/declarative/script/tst_script.cpp
@@ -144,7 +144,7 @@ int TestObject::x()
 
 void tst_script::initTestCase()
 {
-    QML_REGISTER_TYPE(Qt.test, 1, 0, TestObject, TestObject);
+    qmlRegisterType<TestObject>("Qt.test", 1, 0, "TestObject");
 }