diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:27:45 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:27:45 +0200 |
commit | c95b119596c17d8430b24d5e10c4f48fd0a88cb1 (patch) | |
tree | 6afae4fc1d2acc48e1d3715b8b80b9e8347ded20 | |
parent | 7e729ca887f6e106f41acfc9f2081c31b446d114 (diff) | |
parent | f09b12cea1143f1b2763064bb0d3e6592081de2b (diff) | |
download | qtquick1-c95b119596c17d8430b24d5e10c4f48fd0a88cb1.tar.gz |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: I842b005b9818c9e201a09d51bcf418e2dd0a1ef9
6 files changed, 152 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index c3e27e74..14e77ec6 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -2759,8 +2759,10 @@ void QDeclarativeGridView::trackedPositionChanged() void QDeclarativeGridView::itemsInserted(int modelIndex, int count) { Q_D(QDeclarativeGridView); - if (!isComponentComplete()) + if (!isComponentComplete()) { + emit countChanged(); return; + } int index = d->visibleItems.count() ? d->mapFromModel(modelIndex) : 0; if (index < 0) { @@ -2895,8 +2897,10 @@ void QDeclarativeGridView::itemsInserted(int modelIndex, int count) void QDeclarativeGridView::itemsRemoved(int modelIndex, int count) { Q_D(QDeclarativeGridView); - if (!isComponentComplete()) + if (!isComponentComplete()) { + emit countChanged(); return; + } d->itemCount -= count; bool currentRemoved = d->currentIndex >= modelIndex && d->currentIndex < modelIndex + count; diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index a8d97fa7..a2beb4fe 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -3203,8 +3203,10 @@ void QDeclarativeListView::trackedPositionChanged() void QDeclarativeListView::itemsInserted(int modelIndex, int count) { Q_D(QDeclarativeListView); - if (!isComponentComplete()) + if (!isComponentComplete()) { + emit countChanged(); return; + } d->updateUnrequestedIndexes(); d->moveReason = QDeclarativeListViewPrivate::Other; @@ -3356,8 +3358,10 @@ void QDeclarativeListView::itemsInserted(int modelIndex, int count) void QDeclarativeListView::itemsRemoved(int modelIndex, int count) { Q_D(QDeclarativeListView); - if (!isComponentComplete()) + if (!isComponentComplete()) { + emit countChanged(); return; + } d->moveReason = QDeclarativeListViewPrivate::Other; d->updateUnrequestedIndexes(); d->itemCount -= count; diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 001d5d5b..c902e1c8 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -1468,8 +1468,13 @@ void QDeclarativePathView::itemsInserted(int modelIndex, int count) { //XXX support animated insertion Q_D(QDeclarativePathView); - if (!d->isValid() || !isComponentComplete()) + if (!d->isValid()) + return; + + if (!isComponentComplete()) { + emit countChanged(); return; + } if (d->modelCount) { d->itemCache += d->items; @@ -1498,9 +1503,14 @@ void QDeclarativePathView::itemsRemoved(int modelIndex, int count) { //XXX support animated removal Q_D(QDeclarativePathView); - if (!d->model || !d->modelCount || !d->model->isValid() || !d->path || !isComponentComplete()) + if (!d->model || !d->modelCount || !d->model->isValid() || !d->path) return; + if (!isComponentComplete()) { + emit countChanged(); + return; + } + // fix current bool currentChanged = false; if (d->currentIndex >= modelIndex + count) { diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index 43d20442..2fe36303 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -373,8 +373,10 @@ void QDeclarativeRepeater::regenerate() void QDeclarativeRepeater::itemsInserted(int index, int count) { Q_D(QDeclarativeRepeater); - if (!isComponentComplete()) + if (!isComponentComplete()) { + emit countChanged(); return; + } for (int i = 0; i < count; ++i) { int modelIndex = index + i; QDeclarativeItem *item = d->model->item(modelIndex); @@ -395,8 +397,13 @@ void QDeclarativeRepeater::itemsInserted(int index, int count) void QDeclarativeRepeater::itemsRemoved(int index, int count) { Q_D(QDeclarativeRepeater); - if (!isComponentComplete() || count <= 0) + if (count <= 0) return; + + if (!isComponentComplete()) { + emit countChanged(); + return; + } while (count--) { QDeclarativeItem *item = d->deletables.takeAt(index); emit itemRemoved(index, item); diff --git a/tests/auto/declarative/qdeclarativelistview/data/qtbug37115.qml b/tests/auto/declarative/qdeclarativelistview/data/qtbug37115.qml new file mode 100644 index 00000000..d6f86fca --- /dev/null +++ b/tests/auto/declarative/qdeclarativelistview/data/qtbug37115.qml @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +import QtQuick 1.1 +import org.test.models 1.0 + +Rectangle { + + width: 360 + height: 360 + + ListModel { + id: m + ListElement { filter: "X*" } + } + + Repeater { + model: m + delegate: Column { + property string mfilter: model.filter + ListView { + objectName: "listview" + property int countCopy: count // without the fix this won't get updated correctly due to missing countChanged notifications + width: 100; height: 100 + TestFilterModel { + id: fm + filter: mfilter + } + model: fm + delegate: Text { text: "entry " + model.display } + } + } + } +} diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp index 25ab9b38..d23ddf21 100644 --- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp +++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp @@ -52,6 +52,8 @@ public: tst_QDeclarativeListView(); private slots: + void initTestCase(); + // Test both QListModelInterface and QAbstractItemModel model types void qListModelInterface_items(); void qAbstractItemModel_items(); @@ -108,6 +110,7 @@ private slots: void test_mirroring(); void orientationChange(); void contentPosJump(); + void QTBUG_37115(); private: template <class T> void items(); @@ -342,10 +345,41 @@ private: QList<QPair<QString,QString> > list; }; +class TestFilterModel : public QSortFilterProxyModel +{ + Q_OBJECT + Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged) + QString m_filter; + +public: + explicit TestFilterModel(QObject *parent = 0) : QSortFilterProxyModel(parent) + { + setSourceModel(new QStringListModel(QStringList() << "AA" << "BB" << "CC", this)); + } + + QString filter() const { return m_filter; } + void setFilter(const QString &filter) + { + if (m_filter != filter) { + m_filter = filter; + setFilterWildcard(m_filter); + emit filterChanged(); + } + } + +signals: + void filterChanged(); +}; + tst_QDeclarativeListView::tst_QDeclarativeListView() { } +void tst_QDeclarativeListView::initTestCase() +{ + qmlRegisterType<TestFilterModel>("org.test.models", 1, 0, "TestFilterModel"); +} + template <class T> void tst_QDeclarativeListView::items() { @@ -2713,6 +2747,20 @@ void tst_QDeclarativeListView::contentPosJump() delete canvas; } +void tst_QDeclarativeListView::QTBUG_37115() +{ + QDeclarativeView *canvas = createView(); + + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/qtbug37115.qml")); + qApp->processEvents(); + + QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "listview"); + QTRY_VERIFY(listview != 0); + QTRY_COMPARE(listview->property("countCopy").toInt(), 0); + + delete canvas; +} + void tst_QDeclarativeListView::qListModelInterface_items() { items<TestModel>(); |