Merge lp:~mzanetti/kubuntu-packaging/qtdeclarative-opensource-src into lp:~kubuntu-packagers/kubuntu-packaging/qtdeclarative-opensource-src

[Robert Bruce Park]

Fix a performance hit when editing sorted lists (LP: #1303746)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/24/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-utopic-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-utopic-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/24/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/kubuntu-packaging/qtdeclarative-opensource-src]

159. By Michael Zanetti on 2014-06-26

* debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch:
  - Fix a performance hit when editing sorted lists (LP: #1303746)
  - update symbols

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-utopic-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-utopic-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtdeclarative-opensource-src-ci/25/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-19 19:14:47 +0000
+++ debian/changelog	2014-06-26 09:47:31 +0000
@@ -1,3 +1,11 @@
+qtdeclarative-opensource-src (5.3.0-3ubuntu5) utopic; urgency=medium
+
+  * debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch:
+    - Fix a performance hit when editing sorted lists (LP: #1303746)
+    - update symbols
+
+ -- Michael Zanetti <[e-mail]>  Wed, 25 Jun 2014 19:27:13 +0200
+
 qtdeclarative-opensource-src (5.3.0-3ubuntu4) utopic; urgency=medium
 
   [ Ricardo Salveti de Araujo ]

=== modified file 'debian/libqt5qml5.symbols'
--- debian/libqt5qml5.symbols	2014-05-21 15:17:21 +0000
+++ debian/libqt5qml5.symbols	2014-06-26 09:47:31 +0000
@@ -580,7 +580,7 @@
  _ZN17QQmlDelegateModel15_q_rowsInsertedERK11QModelIndexii@Base 5.1.0 1
  _ZN17QQmlDelegateModel15setWatchedRolesE5QListI10QByteArrayE@Base 5.1.0 1
  _ZN17QQmlDelegateModel16_q_itemsInsertedEii@Base 5.1.0 1
- _ZN17QQmlDelegateModel16_q_layoutChangedEv@Base 5.3.0 1
+ _ZN17QQmlDelegateModel16_q_layoutChangedERK5QListI21QPersistentModelIndexEN18QAbstractItemModel16LayoutChangeHintE@Base 5.3.0 1
  _ZN17QQmlDelegateModel16resetFilterGroupEv@Base 5.1.0 1
  _ZN17QQmlDelegateModel16rootIndexChangedEv@Base 5.1.0 1
  _ZN17QQmlDelegateModel16staticMetaObjectE@Base 5.1.0 1
@@ -589,6 +589,7 @@
  _ZN17QQmlDelegateModel20defaultGroupsChangedEv@Base 5.1.0 1
  _ZN17QQmlDelegateModel21qmlAttachedPropertiesEP7QObject@Base 5.1.0 1
  _ZN17QQmlDelegateModel23_q_rowsAboutToBeRemovedERK11QModelIndexii@Base 5.1.0 1
+ _ZN17QQmlDelegateModel25_q_layoutAboutToBeChangedERK5QListI21QPersistentModelIndexEN18QAbstractItemModel16LayoutChangeHintE@Base 5.3.0 1
  _ZN17QQmlDelegateModel5eventEP6QEvent@Base 5.1.0 1
  _ZN17QQmlDelegateModel5itemsEv@Base 5.1.0 1
  _ZN17QQmlDelegateModel5partsEv@Base 5.1.0 1

=== added file 'debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch'
--- debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Implement-proper-support-for-layoutChange-in-QQmlDel.patch	2014-06-26 09:47:31 +0000
@@ -0,0 +1,158 @@
+From 4d4bd2ac531f0456135a1077f5fceea3517cd3cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <[e-mail]>
+Date: Wed, 16 Apr 2014 18:33:24 +0200
+Subject: [PATCH] Implement proper support for layoutChange in
+ QQmlDelegateModel
+
+Current implementation is treating model layoutChange the same way as modelReset,
+which causes problems when using ListView on top of a QSortFilterProxyModel. The
+model emits layoutChanged whenever a data within sorting column change. Treating
+it as modelReset leads to poor performance on large models and caused UI issues,
+because the scrolling position is reset every time.
+
+This patch implements proper handling for layoutChanged signals by first handling
+all items moves and then simulating dataChange for all items.
+
+This fixes regression from Qt 5.1 introduced by Change I16b859d9
+
+Task-number: QTBUG-37983
+Task-number: QTBUG-34391
+Change-Id: I6d3873b7b87e7f0e8fc0c1ed5dc80c6f8fdf6c22
+---
+ src/qml/types/qqmldelegatemodel.cpp   | 59 +++++++++++++++++++++++++++++++++--
+ src/qml/types/qqmldelegatemodel_p.h   |  3 +-
+ src/qml/types/qqmldelegatemodel_p_p.h |  2 ++
+ src/qml/util/qqmladaptormodel.cpp     | 12 ++++---
+ 4 files changed, 69 insertions(+), 7 deletions(-)
+
+diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp
+index be479ee..4591d42 100644
+--- a/src/qml/types/qqmldelegatemodel.cpp
++++ b/src/qml/types/qqmldelegatemodel.cpp
+@@ -1521,9 +1521,64 @@ void QQmlDelegateModel::_q_dataChanged(const QModelIndex &begin, const QModelInd
+         _q_itemsChanged(begin.row(), end.row() - begin.row() + 1, roles);
+ }
+ 
+-void QQmlDelegateModel::_q_layoutChanged()
++void QQmlDelegateModel::_q_layoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
+ {
+-    _q_modelReset();
++    Q_D(QQmlDelegateModel);
++    if (!d->m_complete)
++        return;
++
++    if (hint == QAbstractItemModel::VerticalSortHint) {
++        d->m_storedPersistentIndexes.clear();
++        if (!parents.contains(d->m_adaptorModel.rootIndex))
++            return;
++
++        for (int i = 0; i < d->m_count; ++i) {
++            const QModelIndex index = d->m_adaptorModel.aim()->index(i, 0, d->m_adaptorModel.rootIndex);
++            d->m_storedPersistentIndexes.append(index);
++        }
++    } else if (hint == QAbstractItemModel::HorizontalSortHint) {
++        // Ignored
++    } else {
++        // Triggers model reset, no preparations for that are needed
++    }
++}
++
++void QQmlDelegateModel::_q_layoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint)
++{
++    Q_D(QQmlDelegateModel);
++    if (!d->m_complete)
++        return;
++
++    if (hint == QAbstractItemModel::VerticalSortHint) {
++        if (!parents.contains(d->m_adaptorModel.rootIndex))
++            return;
++
++        for (int i = 0, c = d->m_storedPersistentIndexes.count(); i < c; ++i) {
++            const QPersistentModelIndex &index = d->m_storedPersistentIndexes.at(i);
++            if (i == index.row())
++                continue;
++
++            QVector<Compositor::Insert> inserts;
++            QVector<Compositor::Remove> removes;
++            d->m_compositor.listItemsMoved(&d->m_adaptorModel, i, index.row(), 1, &removes, &inserts);
++            if (!removes.isEmpty() || !inserts.isEmpty()) {
++                d->itemsMoved(removes, inserts);
++            }
++        }
++
++        d->m_storedPersistentIndexes.clear();
++
++        // layoutUpdate does not necessarily have any move changes, but it can
++        // also mean data changes. We can't detect what exactly has changed, so
++        // just emit it for all items
++        _q_itemsChanged(0, d->m_count, QVector<int>());
++
++    } else if (hint == QAbstractItemModel::HorizontalSortHint) {
++        // Ignored
++    } else {
++        // We don't know what's going on, so reset the model
++        _q_modelReset();
++    }
+ }
+ 
+ QQmlDelegateModelAttached *QQmlDelegateModel::qmlAttachedProperties(QObject *obj)
+diff --git a/src/qml/types/qqmldelegatemodel_p.h b/src/qml/types/qqmldelegatemodel_p.h
+index 51f846e..0b67179 100644
+--- a/src/qml/types/qqmldelegatemodel_p.h
++++ b/src/qml/types/qqmldelegatemodel_p.h
+@@ -139,7 +139,8 @@ private Q_SLOTS:
+     void _q_rowsRemoved(const QModelIndex &,int,int);
+     void _q_rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int);
+     void _q_dataChanged(const QModelIndex&,const QModelIndex&,const QVector<int> &);
+-    void _q_layoutChanged();
++    void _q_layoutAboutToBeChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint);
++    void _q_layoutChanged(const QList<QPersistentModelIndex>&, QAbstractItemModel::LayoutChangeHint);
+ 
+ private:
+     Q_DISABLE_COPY(QQmlDelegateModel)
+diff --git a/src/qml/types/qqmldelegatemodel_p_p.h b/src/qml/types/qqmldelegatemodel_p_p.h
+index 32b1154..67deb4f 100644
+--- a/src/qml/types/qqmldelegatemodel_p_p.h
++++ b/src/qml/types/qqmldelegatemodel_p_p.h
+@@ -331,6 +331,8 @@ public:
+         };
+         QQmlDelegateModelGroup *m_groups[Compositor::MaximumGroupCount];
+     };
++
++    QList<QPersistentModelIndex> m_storedPersistentIndexes;
+ };
+ 
+ class QQmlPartsModel : public QQmlInstanceModel, public QQmlDelegateModelGroupEmitter
+diff --git a/src/qml/util/qqmladaptormodel.cpp b/src/qml/util/qqmladaptormodel.cpp
+index d38e5ac..c1c8bfa 100644
+--- a/src/qml/util/qqmladaptormodel.cpp
++++ b/src/qml/util/qqmladaptormodel.cpp
+@@ -467,8 +467,10 @@ public:
+                                 vdm, SLOT(_q_rowsMoved(QModelIndex,int,int,QModelIndex,int)));
+             QObject::disconnect(aim, SIGNAL(modelReset()),
+                                 vdm, SLOT(_q_modelReset()));
+-            QObject::disconnect(aim, SIGNAL(layoutChanged()),
+-                                vdm, SLOT(_q_layoutChanged()));
++            QObject::disconnect(aim, SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
++                                vdm, SLOT(_q_layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
++            QObject::disconnect(aim, SIGNAL(layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
++                                vdm, SLOT(_q_layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
+         }
+ 
+         const_cast<VDMAbstractItemModelDataType *>(this)->release();
+@@ -920,8 +922,10 @@ void QQmlAdaptorModel::setModel(const QVariant &variant, QQmlDelegateModel *vdm,
+                               vdm, QQmlDelegateModel, SLOT(_q_rowsMoved(QModelIndex,int,int,QModelIndex,int)));
+             qmlobject_connect(model, QAbstractItemModel, SIGNAL(modelReset()),
+                               vdm, QQmlDelegateModel, SLOT(_q_modelReset()));
+-            qmlobject_connect(model, QAbstractItemModel, SIGNAL(layoutChanged()),
+-                              vdm, QQmlDelegateModel, SLOT(_q_layoutChanged()));
++            qmlobject_connect(model, QAbstractItemModel, SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
++                              vdm, QQmlDelegateModel, SLOT(_q_layoutAboutToBeChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
++            qmlobject_connect(model, QAbstractItemModel, SIGNAL(layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)),
++                              vdm, QQmlDelegateModel, SLOT(_q_layoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
+         } else {
+             accessors = new VDMObjectDelegateDataType;
+         }
+-- 
+1.9.1
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-06-18 08:15:27 +0000
+++ debian/patches/series	2014-06-26 09:47:31 +0000
@@ -5,3 +5,4 @@
 Make-ItemViews-displayMargin-work-correctly-when-set.patch
 v4_yarr_jit_push_pop_addressTempRegister.patch
 fix_qqmlobjectcreator.patch
+Implement-proper-support-for-layoutChange-in-QQmlDel.patch