From 50e3f9dba978709c35c869ccaa8345719f23deb1 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 22 Mar 2010 16:00:27 +1000
Subject: Properly use one thread for all instances of XmlListModel.

Task-number: QT-2831
---
 src/declarative/util/qdeclarativexmllistmodel.cpp  | 190 ++++++++++++---------
 src/declarative/util/qdeclarativexmllistmodel_p.h  |  15 +-
 .../tst_qdeclarativexmllistmodel.cpp               |  66 +++++++
 3 files changed, 188 insertions(+), 83 deletions(-)

diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 01ae2ed..03ddddf 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -46,6 +46,7 @@
 
 #include <QDebug>
 #include <QStringList>
+#include <QQueue>
 #include <QApplication>
 #include <QThread>
 #include <QMutex>
@@ -61,8 +62,7 @@
 
 QT_BEGIN_NAMESPACE
 
-
-
+Q_DECLARE_METATYPE(QDeclarativeXmlQueryResult)
 
 typedef QPair<int, int> QDeclarativeXmlListRange;
 
@@ -109,13 +109,25 @@ typedef QPair<int, int> QDeclarativeXmlListRange;
     \sa XmlListModel
 */
 
+struct XmlQueryJob
+{
+    int queryId;
+    QByteArray data;
+    QString query;
+    QString namespaces;
+    QStringList roleQueries;
+    QStringList keyRoleQueries;
+    QStringList keyRoleResultsCache;
+};
+
 
 class QDeclarativeXmlQuery : public QThread
 {
     Q_OBJECT
 public:
     QDeclarativeXmlQuery(QObject *parent=0)
-        : QThread(parent), m_quit(false), m_restart(false), m_abort(false), m_queryId(0) {
+        : QThread(parent), m_quit(false), m_abortQueryId(-1), m_queryIds(0) {
+        qRegisterMetaType<QDeclarativeXmlQueryResult>("QDeclarativeXmlQueryResult");
     }
     ~QDeclarativeXmlQuery() {
         m_mutex.lock();
@@ -126,27 +138,38 @@ public:
         wait();
     }
 
-    void abort() {
+    void abort(int id) {
         QMutexLocker locker(&m_mutex);
-        m_abort = true;
+        m_abortQueryId = id;
     }
 
-    int doQuery(QString query, QString namespaces, QByteArray data, QList<QDeclarativeXmlListModelRole *> *roleObjects) {
+    int doQuery(QString query, QString namespaces, QByteArray data, QList<QDeclarativeXmlListModelRole *> *roleObjects, QStringList keyRoleResultsCache) {
         QMutexLocker locker(&m_mutex);
-        m_size = 0;
-        m_data = data;
-        m_query = QLatin1String("doc($src)") + query;
-        m_namespaces = namespaces;
-        m_roleObjects = roleObjects;
-        if (!isRunning()) {
-            m_abort = false;
+
+        XmlQueryJob job;
+        job.queryId = m_queryIds;
+        job.data = data;
+        job.query = QLatin1String("doc($src)") + query;
+        job.namespaces = namespaces;
+        job.keyRoleResultsCache = keyRoleResultsCache;
+
+        for (int i=0; i<roleObjects->count(); i++) {
+            if (!roleObjects->at(i)->isValid()) {
+                job.roleQueries << "";
+                continue;
+            }
+            job.roleQueries << roleObjects->at(i)->query();
+            if (roleObjects->at(i)->isKey())
+                job.keyRoleQueries << job.roleQueries.last();
+        }
+        m_jobs.enqueue(job);
+        m_queryIds++;
+
+        if (!isRunning())
             start();
-        } else {
-            m_restart = true;
+        else
             m_condition.wakeOne();
-        }
-        m_queryId++;
-        return m_queryId;
+        return job.queryId;
     }
 
     QList<QList<QVariant> > modelData() {
@@ -164,26 +187,33 @@ public:
         return m_removedItemRanges;
     }
 
+
 Q_SIGNALS:
-    void queryCompleted(int queryId, int size);
+    void queryCompleted(const QDeclarativeXmlQueryResult &);
 
 protected:
     void run() {
         while (!m_quit) {
             m_mutex.lock();
-            int queryId = m_queryId;
             doQueryJob();
             doSubQueryJob();
-            m_data.clear(); // no longer needed
             m_mutex.unlock();
 
             m_mutex.lock();
-            if (!m_abort)
-                emit queryCompleted(queryId, m_size);
-            if (!m_restart)
+            const XmlQueryJob &job = m_jobs.dequeue();
+            if (m_abortQueryId != job.queryId) {
+                QDeclarativeXmlQueryResult r;
+                r.queryId = job.queryId;
+                r.size = m_size;
+                r.data = m_modelData;
+                r.inserted = m_insertedItemRanges;
+                r.removed = m_removedItemRanges;
+                r.keyRoleResultsCache = job.keyRoleResultsCache;
+                emit queryCompleted(r);
+            }
+            if (m_jobs.isEmpty())
                 m_condition.wait(&m_mutex);
-            m_abort = false;
-            m_restart = false;
+            m_abortQueryId = -1;
             m_mutex.unlock();
         }
     }
@@ -197,30 +227,30 @@ private:
 private:
     QMutex m_mutex;
     QWaitCondition m_condition;
+    QQueue<XmlQueryJob> m_jobs;
     bool m_quit;
-    bool m_restart;
-    bool m_abort;
-    QByteArray m_data;
-    QString m_query;
-    QString m_namespaces;
+    int m_abortQueryId;
     QString m_prefix;
     int m_size;
-    int m_queryId;
-    const QList<QDeclarativeXmlListModelRole *> *m_roleObjects;
+    int m_queryIds;
     QList<QList<QVariant> > m_modelData;
-    QStringList m_keysValues;
     QList<QDeclarativeXmlListRange> m_insertedItemRanges;
     QList<QDeclarativeXmlListRange> m_removedItemRanges;
 };
 
+Q_GLOBAL_STATIC(QDeclarativeXmlQuery, globalXmlQuery)
+
 void QDeclarativeXmlQuery::doQueryJob()
 {
+    Q_ASSERT(!m_jobs.isEmpty());
+    XmlQueryJob &job = m_jobs.head();
+
     QString r;
     QXmlQuery query;
-    QBuffer buffer(&m_data);
+    QBuffer buffer(&job.data);
     buffer.open(QIODevice::ReadOnly);
     query.bindVariable(QLatin1String("src"), &buffer);
-    query.setQuery(m_namespaces + m_query);
+    query.setQuery(job.namespaces + job.query);
     query.evaluateTo(&r);
 
     //qDebug() << r;
@@ -231,9 +261,9 @@ void QDeclarativeXmlQuery::doQueryJob()
     b.open(QIODevice::ReadOnly);
     //qDebug() << xml;
 
-    QString namespaces = QLatin1String("declare namespace dummy=\"http://qtsotware.com/dummy\";\n") + m_namespaces;
+    QString namespaces = QLatin1String("declare namespace dummy=\"http://qtsotware.com/dummy\";\n") + job.namespaces;
     QString prefix = QLatin1String("doc($inputDocument)/dummy:items") +
-                     m_query.mid(m_query.lastIndexOf(QLatin1Char('/')));
+                     job.query.mid(job.query.lastIndexOf(QLatin1Char('/')));
 
     //figure out how many items we are dealing with
     int count = -1;
@@ -249,19 +279,18 @@ void QDeclarativeXmlQuery::doQueryJob()
     }
     //qDebug() << count;
 
+    job.data = xml;
     m_prefix = namespaces + prefix + QLatin1Char('/');
-    m_data = xml;
+    m_size = 0;
     if (count > 0)
         m_size = count;
 }
 
 void QDeclarativeXmlQuery::getValuesOfKeyRoles(QStringList *values, QXmlQuery *query) const
 {
-    QStringList keysQueries;
-    for (int i=0; i<m_roleObjects->count(); i++) {
-        if (m_roleObjects->at(i)->isKey())
-            keysQueries << m_roleObjects->at(i)->query();
-    }
+    Q_ASSERT(!m_jobs.isEmpty());
+
+    const QStringList &keysQueries = m_jobs.head().keyRoleQueries;
     QString keysQuery;
     if (keysQueries.count() == 1)
         keysQuery = m_prefix + keysQueries[0];
@@ -291,54 +320,58 @@ void QDeclarativeXmlQuery::addIndexToRangeList(QList<QDeclarativeXmlListRange> *
 
 void QDeclarativeXmlQuery::doSubQueryJob()
 {
+    Q_ASSERT(!m_jobs.isEmpty());
+    XmlQueryJob &job = m_jobs.head();
     m_modelData.clear();
 
-    QBuffer b(&m_data);
+    QBuffer b(&job.data);
     b.open(QIODevice::ReadOnly);
 
     QXmlQuery subquery;
     subquery.bindVariable(QLatin1String("inputDocument"), &b);
 
-    QStringList keysValues;
-    getValuesOfKeyRoles(&keysValues, &subquery);
+    QStringList keyRoleResults;
+    getValuesOfKeyRoles(&keyRoleResults, &subquery);
 
     // See if any values of key roles have been inserted or removed.
+
     m_insertedItemRanges.clear();
     m_removedItemRanges.clear();
-    if (m_keysValues.isEmpty()) {
+    if (job.keyRoleResultsCache.isEmpty()) {
         m_insertedItemRanges << qMakePair(0, m_size);
     } else {
-        if (keysValues != m_keysValues) {
+        if (keyRoleResults != job.keyRoleResultsCache) {
             QStringList temp;
-            for (int i=0; i<m_keysValues.count(); i++) {
-                if (!keysValues.contains(m_keysValues[i]))
+            for (int i=0; i<job.keyRoleResultsCache.count(); i++) {
+                if (!keyRoleResults.contains(job.keyRoleResultsCache[i]))
                     addIndexToRangeList(&m_removedItemRanges, i);
                 else 
-                    temp << m_keysValues[i];
+                    temp << job.keyRoleResultsCache[i];
             }
 
-            for (int i=0; i<keysValues.count(); i++) {
-                if (temp.count() == i || keysValues[i] != temp[i]) {
-                    temp.insert(i, keysValues[i]);
+            for (int i=0; i<keyRoleResults.count(); i++) {
+                if (temp.count() == i || keyRoleResults[i] != temp[i]) {
+                    temp.insert(i, keyRoleResults[i]);
                     addIndexToRangeList(&m_insertedItemRanges, i);
                 }
             }
         }
     }
-    m_keysValues = keysValues;
+    job.keyRoleResultsCache = keyRoleResults;
+
 
     // Get the new values for each role.
     //### we might be able to condense even further (query for everything in one go)
-    for (int i = 0; i < m_roleObjects->size(); ++i) {
-        QDeclarativeXmlListModelRole *role = m_roleObjects->at(i);
-        if (!role->isValid()) {
+    const QStringList &queries = job.roleQueries;
+    for (int i = 0; i < queries.size(); ++i) {
+        if (queries[i].isEmpty()) {
             QList<QVariant> resultList;
             for (int j = 0; j < m_size; ++j)
                 resultList << QVariant();
             m_modelData << resultList;
             continue;
         }
-        subquery.setQuery(m_prefix + QLatin1String("(let $v := ") + role->query() + QLatin1String(" return if ($v) then ") + role->query() + QLatin1String(" else \"\")"));
+        subquery.setQuery(m_prefix + QLatin1String("(let $v := ") + queries[i] + QLatin1String(" return if ($v) then ") + queries[i] + QLatin1String(" else \"\")"));
         QXmlResultItems resultItems;
         subquery.evaluateTo(&resultItems);
         QXmlItem item(resultItems.next());
@@ -404,8 +437,8 @@ public:
     QNetworkReply *reply;
     QDeclarativeXmlListModel::Status status;
     qreal progress;
-    QDeclarativeXmlQuery qmlXmlQuery;
     int queryId;
+    QStringList keyRoleResultsCache;
     QList<QDeclarativeXmlListModelRole *> roleObjects;
     static void append_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, QDeclarativeXmlListModelRole *role);
     static void clear_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list);
@@ -489,9 +522,8 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecla
 QDeclarativeXmlListModel::QDeclarativeXmlListModel(QObject *parent)
     : QListModelInterface(*(new QDeclarativeXmlListModelPrivate), parent)
 {
-    Q_D(QDeclarativeXmlListModel);
-    connect(&d->qmlXmlQuery, SIGNAL(queryCompleted(int,int)),
-            this, SLOT(queryCompleted(int,int)));
+    connect(globalXmlQuery(), SIGNAL(queryCompleted(QDeclarativeXmlQueryResult)),
+            this, SLOT(queryCompleted(QDeclarativeXmlQueryResult)));
 }
 
 QDeclarativeXmlListModel::~QDeclarativeXmlListModel()
@@ -723,7 +755,7 @@ void QDeclarativeXmlListModel::reload()
     if (!d->isComponentComplete)
         return;
 
-    d->qmlXmlQuery.abort();
+    globalXmlQuery()->abort(d->queryId);
     d->queryId = -1;
 
     int count = d->size;
@@ -755,7 +787,7 @@ void QDeclarativeXmlListModel::reload()
     }
 
     if (!d->xml.isEmpty()) {
-        d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, d->xml.toUtf8(), &d->roleObjects);
+        d->queryId = globalXmlQuery()->doQuery(d->query, d->namespaces, d->xml.toUtf8(), &d->roleObjects, d->keyRoleResultsCache);
         d->progress = 1.0;
         d->status = Ready;
         emit progressChanged(d->progress);
@@ -802,7 +834,7 @@ void QDeclarativeXmlListModel::requestFinished()
     } else {
         d->status = Ready;
         QByteArray data = d->reply->readAll();
-        d->queryId = d->qmlXmlQuery.doQuery(d->query, d->namespaces, data, &d->roleObjects);
+        d->queryId = globalXmlQuery()->doQuery(d->query, d->namespaces, data, &d->roleObjects, d->keyRoleResultsCache);
         disconnect(d->reply, 0, this, 0);
         d->reply->deleteLater();
         d->reply = 0;
@@ -821,22 +853,20 @@ void QDeclarativeXmlListModel::requestProgress(qint64 received, qint64 total)
     }
 }
 
-void QDeclarativeXmlListModel::queryCompleted(int id, int size)
+void QDeclarativeXmlListModel::queryCompleted(const QDeclarativeXmlQueryResult &result)
 {
     Q_D(QDeclarativeXmlListModel);
-    if (id != d->queryId)
+    if (result.queryId != d->queryId)
         return;
-    bool sizeChanged = size != d->size;
-    d->size = size;
-    d->data = d->qmlXmlQuery.modelData();
-
-    QList<QDeclarativeXmlListRange> removed = d->qmlXmlQuery.removedItemRanges();
-    QList<QDeclarativeXmlListRange> inserted = d->qmlXmlQuery.insertedItemRanges();
-
-    for (int i=0; i<removed.count(); i++)
-        emit itemsRemoved(removed[i].first, removed[i].second);
-    for (int i=0; i<inserted.count(); i++)
-        emit itemsInserted(inserted[i].first, inserted[i].second);
+    bool sizeChanged = result.size != d->size;
+    d->size = result.size;
+    d->data = result.data;
+    d->keyRoleResultsCache = result.keyRoleResultsCache;
+
+    for (int i=0; i<result.removed.count(); i++)
+        emit itemsRemoved(result.removed[i].first, result.removed[i].second);
+    for (int i=0; i<result.inserted.count(); i++)
+        emit itemsInserted(result.inserted[i].first, result.inserted[i].second);
 
     if (sizeChanged)
         emit countChanged();
diff --git a/src/declarative/util/qdeclarativexmllistmodel_p.h b/src/declarative/util/qdeclarativexmllistmodel_p.h
index 23ff7ce..7bb0f0e 100644
--- a/src/declarative/util/qdeclarativexmllistmodel_p.h
+++ b/src/declarative/util/qdeclarativexmllistmodel_p.h
@@ -46,6 +46,7 @@
 #include <qdeclarativeinfo.h>
 
 #include <QtCore/qurl.h>
+#include <QtCore/qstringlist.h>
 
 #include <private/qlistmodelinterface_p.h>
 
@@ -56,10 +57,18 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeContext;
-
 class QDeclarativeXmlListModelRole;
-
 class QDeclarativeXmlListModelPrivate;
+
+struct QDeclarativeXmlQueryResult {
+    int queryId;
+    int size;
+    QList<QList<QVariant> > data;
+    QList<QPair<int, int> > inserted;
+    QList<QPair<int, int> > removed;
+    QStringList keyRoleResultsCache;
+};
+
 class Q_DECLARATIVE_EXPORT QDeclarativeXmlListModel : public QListModelInterface, public QDeclarativeParserStatus
 {
     Q_OBJECT
@@ -126,7 +135,7 @@ public Q_SLOTS:
 private Q_SLOTS:
     void requestFinished();
     void requestProgress(qint64,qint64);
-    void queryCompleted(int,int);
+    void queryCompleted(const QDeclarativeXmlQueryResult &);
 
 private:
     Q_DECLARE_PRIVATE(QDeclarativeXmlListModel)
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index 0e5e1b0..81cc922 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -74,6 +74,8 @@ private slots:
     void useKeys_data();
     void noKeysValueChanges();
     void keysChanged();
+    void threading();
+    void threading_data();
     void propertyChanges();
 
 private:
@@ -86,6 +88,8 @@ private:
         if (!data.isEmpty()) {
             QStringList items = data.split(";");
             foreach(const QString &item, items) {
+                if (item.isEmpty())
+                    continue;
                 QVariantList variants;
                 xml += QLatin1String("<item>");
                 QStringList fields = item.split(",");
@@ -505,6 +509,63 @@ void tst_qdeclarativexmllistmodel::keysChanged()
     delete model;
 }
 
+void tst_qdeclarativexmllistmodel::threading()
+{
+    QFETCH(int, xmlDataCount);
+
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/roleKeys.qml"));
+
+    QDeclarativeXmlListModel *m1 = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(m1 != 0); 
+    QDeclarativeXmlListModel *m2 = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(m2 != 0); 
+    QDeclarativeXmlListModel *m3 = qobject_cast<QDeclarativeXmlListModel*>(component.create());
+    QVERIFY(m3 != 0); 
+
+    for (int dataCount=0; dataCount<xmlDataCount; dataCount++) {
+
+        QString data1, data2, data3;
+        for (int i=0; i<dataCount; i++) {
+            data1 += "name=A" + QString::number(i) + ",age=1" + QString::number(i) + ",sport=Football;";
+            data2 += "name=B" + QString::number(i) + ",age=2" + QString::number(i) + ",sport=Athletics;";
+            data3 += "name=C" + QString::number(i) + ",age=3" + QString::number(i) + ",sport=Curling;";
+        }
+
+        m1->setXml(makeItemXmlAndData(data1));
+        m2->setXml(makeItemXmlAndData(data2));
+        m3->setXml(makeItemXmlAndData(data3));
+
+        QTRY_VERIFY(m1->count() == dataCount && m2->count() == dataCount && m3->count() == dataCount);
+
+        for (int i=0; i<dataCount; i++) {
+            QCOMPARE(m1->data(i, m1->roles()[0]).toString(), QString("A" + QString::number(i)));
+            QCOMPARE(m1->data(i, m1->roles()[1]).toString(), QString("1" + QString::number(i)));
+            QCOMPARE(m1->data(i, m1->roles()[2]).toString(), QString("Football"));
+
+            QCOMPARE(m2->data(i, m2->roles()[0]).toString(), QString("B" + QString::number(i)));
+            QCOMPARE(m2->data(i, m2->roles()[1]).toString(), QString("2" + QString::number(i)));
+            QCOMPARE(m2->data(i, m2->roles()[2]).toString(), QString("Athletics"));
+
+            QCOMPARE(m3->data(i, m3->roles()[0]).toString(), QString("C" + QString::number(i)));
+            QCOMPARE(m3->data(i, m3->roles()[1]).toString(), QString("3" + QString::number(i)));
+            QCOMPARE(m3->data(i, m3->roles()[2]).toString(), QString("Curling"));
+        }
+    }
+
+    delete m1;
+    delete m2;
+    delete m3;
+}
+
+void tst_qdeclarativexmllistmodel::threading_data()
+{
+    QTest::addColumn<int>("xmlDataCount");
+
+    QTest::newRow("1") << 1;
+    QTest::newRow("2") << 2;
+    QTest::newRow("10") << 10;
+}
+
 void tst_qdeclarativexmllistmodel::propertyChanges()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/propertychanges.qml"));
@@ -554,6 +615,8 @@ void tst_qdeclarativexmllistmodel::propertyChanges()
     QCOMPARE(model->query(), QString("/Pets"));
     QCOMPARE(model->namespaceDeclarations(), QString("declare namespace media=\"http://search.yahoo.com/mrss/\";"));
 
+    QTRY_VERIFY(model->count() == 1);
+
     QCOMPARE(sourceSpy.count(),1);
     QCOMPARE(xmlSpy.count(),1);
     QCOMPARE(modelQuerySpy.count(),1);
@@ -568,6 +631,9 @@ void tst_qdeclarativexmllistmodel::propertyChanges()
     QCOMPARE(xmlSpy.count(),1);
     QCOMPARE(modelQuerySpy.count(),1);
     QCOMPARE(namespaceDeclarationsSpy.count(),1);
+
+    QTRY_VERIFY(model->count() == 1);
+    delete model;
 }
 
 QTEST_MAIN(tst_qdeclarativexmllistmodel)
-- 
cgit v0.12


From 929488ba788549a9b38c1ab3784307b575a537a5 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Wed, 24 Mar 2010 13:32:37 +1000
Subject: Add object ids to the metadata provided in debugger classes.

---
 src/declarative/debugger/qdeclarativedebug.cpp   | 14 ++++++++++----
 src/declarative/debugger/qdeclarativedebug_p.h   |  2 ++
 src/declarative/qml/qdeclarativecontext.cpp      | 15 +++++++++++++++
 src/declarative/qml/qdeclarativecontext_p.h      |  2 ++
 src/declarative/qml/qdeclarativeenginedebug.cpp  | 15 +++++++++++----
 src/declarative/qml/qdeclarativeenginedebug_p.h  |  1 +
 src/declarative/qml/qdeclarativeintegercache.cpp | 10 ++++++++++
 src/declarative/qml/qdeclarativeintegercache_p.h |  1 +
 8 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/src/declarative/debugger/qdeclarativedebug.cpp b/src/declarative/debugger/qdeclarativedebug.cpp
index e4b7d4d..677d05f 100644
--- a/src/declarative/debugger/qdeclarativedebug.cpp
+++ b/src/declarative/debugger/qdeclarativedebug.cpp
@@ -151,6 +151,7 @@ void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugOb
     ds >> data;
     o.m_debugId = data.objectId;
     o.m_class = data.objectType;
+    o.m_idString = data.idString;
     o.m_name = data.objectName;
     o.m_source.m_url = data.url;
     o.m_source.m_lineNumber = data.lineNumber;
@@ -750,8 +751,8 @@ QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(int debugId)
 }
 
 QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(const QDeclarativeDebugObjectReference &o)
-: m_debugId(o.m_debugId), m_class(o.m_class), m_name(o.m_name),
-  m_source(o.m_source), m_contextDebugId(o.m_contextDebugId),
+: m_debugId(o.m_debugId), m_class(o.m_class), m_idString(o.m_idString),
+  m_name(o.m_name), m_source(o.m_source), m_contextDebugId(o.m_contextDebugId),
   m_properties(o.m_properties), m_children(o.m_children)
 {
 }
@@ -759,8 +760,8 @@ QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(const QDeclar
 QDeclarativeDebugObjectReference &
 QDeclarativeDebugObjectReference::operator=(const QDeclarativeDebugObjectReference &o)
 {
-    m_debugId = o.m_debugId; m_class = o.m_class; m_name = o.m_name; 
-    m_source = o.m_source; m_contextDebugId = o.m_contextDebugId;
+    m_debugId = o.m_debugId; m_class = o.m_class; m_idString = o.m_idString;
+    m_name = o.m_name; m_source = o.m_source; m_contextDebugId = o.m_contextDebugId;
     m_properties = o.m_properties; m_children = o.m_children;
     return *this;
 }
@@ -775,6 +776,11 @@ QString QDeclarativeDebugObjectReference::className() const
     return m_class;
 }
 
+QString QDeclarativeDebugObjectReference::idString() const
+{
+    return m_idString;
+}
+
 QString QDeclarativeDebugObjectReference::name() const
 {
     return m_name;
diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h
index f0c7a77..4ead232 100644
--- a/src/declarative/debugger/qdeclarativedebug_p.h
+++ b/src/declarative/debugger/qdeclarativedebug_p.h
@@ -230,6 +230,7 @@ public:
 
     int debugId() const;
     QString className() const;
+    QString idString() const;
     QString name() const;
 
     QDeclarativeDebugFileReference source() const;
@@ -242,6 +243,7 @@ private:
     friend class QDeclarativeEngineDebugPrivate;
     int m_debugId;
     QString m_class;
+    QString m_idString;
     QString m_name;
     QDeclarativeDebugFileReference m_source;
     int m_contextDebugId;
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index f801a88..1236923 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -730,6 +730,21 @@ void QDeclarativeContextData::setIdPropertyData(QDeclarativeIntegerCache *data)
     idValues = new ContextGuard[idValueCount];
 }
 
+QString QDeclarativeContextData::findObjectId(const QObject *obj) const
+{
+    if (!idValues || !propertyNames)
+        return QString();
+
+    for (int i=0; i<idValueCount; i++) {
+        if (idValues[i] == obj)
+            return propertyNames->findId(i);
+    }    
+
+    if (linkedContext)
+        return linkedContext->findObjectId(obj);
+    return QString();
+}
+
 QDeclarativeContext *QDeclarativeContextData::asQDeclarativeContext()
 {
     if (!publicContext) 
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index f07045e..e5f18b3 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -190,6 +190,8 @@ public:
     // Linked contexts. this owns linkedContext.
     QDeclarativeContextData *linkedContext;
 
+    QString findObjectId(const QObject *obj) const;
+
     static QDeclarativeContextData *get(QDeclarativeContext *context) {
         return QDeclarativeContextPrivate::get(context)->data;
     }
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index a377b35..d30aa8e 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -68,16 +68,16 @@ QDeclarativeEngineDebugServer::QDeclarativeEngineDebugServer(QObject *parent)
 QDataStream &operator<<(QDataStream &ds, 
                         const QDeclarativeEngineDebugServer::QDeclarativeObjectData &data)
 {
-    ds << data.url << data.lineNumber << data.columnNumber << data.objectName
-       << data.objectType << data.objectId << data.contextId;
+    ds << data.url << data.lineNumber << data.columnNumber << data.idString
+       << data.objectName << data.objectType << data.objectId << data.contextId;
     return ds;
 }
 
 QDataStream &operator>>(QDataStream &ds, 
                         QDeclarativeEngineDebugServer::QDeclarativeObjectData &data)
 {
-    ds >> data.url >> data.lineNumber >> data.columnNumber >> data.objectName
-       >> data.objectType >> data.objectId >> data.contextId;
+    ds >> data.url >> data.lineNumber >> data.columnNumber >> data.idString
+       >> data.objectName >> data.objectType >> data.objectId >> data.contextId;
     return ds;
 }
 
@@ -275,6 +275,13 @@ QDeclarativeEngineDebugServer::objectData(QObject *object)
         rv.columnNumber = -1;
     }
 
+    QDeclarativeContext *context = qmlContext(object);
+    if (context) {
+        QDeclarativeContextData *cdata = QDeclarativeContextData::get(context);
+        if (cdata)
+            rv.idString = cdata->findObjectId(object);
+    }
+
     rv.objectName = object->objectName();
     rv.objectId = QDeclarativeDebugService::idForObject(object);
     rv.contextId = QDeclarativeDebugService::idForObject(qmlContext(object));
diff --git a/src/declarative/qml/qdeclarativeenginedebug_p.h b/src/declarative/qml/qdeclarativeenginedebug_p.h
index a95449b..9491411 100644
--- a/src/declarative/qml/qdeclarativeenginedebug_p.h
+++ b/src/declarative/qml/qdeclarativeenginedebug_p.h
@@ -75,6 +75,7 @@ public:
         QUrl url;
         int lineNumber;
         int columnNumber;
+        QString idString;
         QString objectName;
         QString objectType;
         int objectId;
diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp
index 8fa210f..be36471 100644
--- a/src/declarative/qml/qdeclarativeintegercache.cpp
+++ b/src/declarative/qml/qdeclarativeintegercache.cpp
@@ -64,6 +64,16 @@ void QDeclarativeIntegerCache::clear()
     engine = 0;
 }
 
+QString QDeclarativeIntegerCache::findId(int value) const
+{
+    for (StringCache::ConstIterator iter = stringCache.begin();
+            iter != stringCache.end(); ++iter) {
+        if (iter.value() && iter.value()->value == value)
+            return iter.key();
+    }
+    return QString();
+}
+
 void QDeclarativeIntegerCache::add(const QString &id, int value)
 {
     Q_ASSERT(!stringCache.contains(id));
diff --git a/src/declarative/qml/qdeclarativeintegercache_p.h b/src/declarative/qml/qdeclarativeintegercache_p.h
index b57565e..5fb5a76 100644
--- a/src/declarative/qml/qdeclarativeintegercache_p.h
+++ b/src/declarative/qml/qdeclarativeintegercache_p.h
@@ -73,6 +73,7 @@ public:
     inline int count() const;
     void add(const QString &, int);
     int value(const QString &);
+    QString findId(int value) const;
     inline int value(const QScriptDeclarativeClass::Identifier &id) const;
 
 protected:
-- 
cgit v0.12


From f59619a3a4de074d0557ce17f9580a242e4e6c16 Mon Sep 17 00:00:00 2001
From: Leonardo Sobral Cunha <leo.cunha@nokia.com>
Date: Wed, 24 Mar 2010 15:20:16 +1000
Subject: Fix abort in flipable

Flipable was calling updateSceneTransformFromParent, but this can only
called when the the parent's scene transform is guaranteed to be updated,
which is not the case in flipable.

Task-number: QTBUG-8474
Reviewed-by: bnilsen
---
 src/declarative/graphicsitems/qdeclarativeflipable.cpp    |  2 +-
 .../qdeclarativeflipable/tst_qdeclarativeflipable.cpp     | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index 8b46039..0e2ae63 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -160,7 +160,7 @@ QDeclarativeFlipable::Side QDeclarativeFlipable::side() const
 {
     Q_D(const QDeclarativeFlipable);
     if (d->dirtySceneTransform)
-        const_cast<QDeclarativeFlipablePrivate *>(d)->updateSceneTransformFromParent();
+        const_cast<QDeclarativeFlipablePrivate *>(d)->ensureSceneTransform();
 
     return d->current;
 }
diff --git a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
index 04c6710..4beee9a 100644
--- a/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
+++ b/tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp
@@ -58,7 +58,10 @@ private slots:
     void create();
     void checkFrontAndBack();
     void setFrontAndBack();
-    void crash();
+
+    // below here task issues
+    void QTBUG_9161_crash();
+    void QTBUG_8474_qgv_abort();
 
 private:
     QDeclarativeEngine engine;
@@ -110,7 +113,7 @@ void tst_qdeclarativeflipable::setFrontAndBack()
     delete obj;
 }
 
-void tst_qdeclarativeflipable::crash()
+void tst_qdeclarativeflipable::QTBUG_9161_crash()
 {
     QDeclarativeView *canvas = new QDeclarativeView;
     canvas->setSource(QUrl(SRCDIR "/data/crash.qml"));
@@ -118,6 +121,14 @@ void tst_qdeclarativeflipable::crash()
     delete canvas;
 }
 
+void tst_qdeclarativeflipable::QTBUG_8474_qgv_abort()
+{
+    QDeclarativeView *canvas = new QDeclarativeView;
+    canvas->setSource(QUrl(SRCDIR "/data/flipable-abort.qml"));
+    canvas->show();
+    delete canvas;
+}
+
 QTEST_MAIN(tst_qdeclarativeflipable)
 
 #include "tst_qdeclarativeflipable.moc"
-- 
cgit v0.12