[arch-commits] Commit in qt/trunk (PKGBUILD qsortfilterproxymodel.patch)
Andrea Scarpino
andrea at archlinux.org
Sun Nov 4 09:16:52 UTC 2012
Date: Sunday, November 4, 2012 @ 04:16:52
Author: andrea
Revision: 170185
Do not patch non-existent file
Modified:
qt/trunk/PKGBUILD
qt/trunk/qsortfilterproxymodel.patch
-----------------------------+
PKGBUILD | 2 -
qsortfilterproxymodel.patch | 78 ------------------------------------------
2 files changed, 1 insertion(+), 79 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-11-04 08:23:34 UTC (rev 170184)
+++ PKGBUILD 2012-11-04 09:16:52 UTC (rev 170185)
@@ -32,7 +32,7 @@
'57590084078b6379f0501f7728b02ae2'
'94e9e433342018bf35e8d6d968b7432c'
'71579422635e9343665de1c1ba5a3f91'
- 'd288b87afa4a3c81e54a3aea8f42e3b0')
+ 'cd550cd628d10459128ca5f231ca6d3f')
build() {
cd ${_pkgfqn}
Modified: qsortfilterproxymodel.patch
===================================================================
--- qsortfilterproxymodel.patch 2012-11-04 08:23:34 UTC (rev 170184)
+++ qsortfilterproxymodel.patch 2012-11-04 09:16:52 UTC (rev 170185)
@@ -58,84 +58,6 @@
}
/*!
-diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-index 8ab5098..d0887fc 100644
---- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-@@ -152,6 +152,7 @@ private slots:
- void testResetInternalData();
- void filteredColumns();
- void hierarchyFilterInvalidation();
-+ void simpleFilterInvalidation();
-
- protected:
- void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
-@@ -3475,5 +3476,65 @@ void tst_QSortFilterProxyModel::hierarchyFilterInvalidation()
- proxy.setMode(true);
- }
-
-+
-+class FilterProxy2 : public QSortFilterProxyModel
-+{
-+ Q_OBJECT
-+public:
-+ FilterProxy2(QObject *parent = 0)
-+ : QSortFilterProxyModel(parent),
-+ mode(false)
-+ {
-+
-+ }
-+
-+public slots:
-+ void setMode(bool on)
-+ {
-+ mode = on;
-+ invalidateFilter();
-+ }
-+
-+protected:
-+ virtual bool filterAcceptsRow ( int source_row, const QModelIndex & source_parent ) const
-+ {
-+ if (source_parent.isValid()) {
-+ return true;
-+ } else {
-+ if (0 == source_row) {
-+ return true;
-+ } else {
-+ return !mode;
-+ }
-+ }
-+ }
-+
-+private:
-+ bool mode;
-+};
-+
-+void tst_QSortFilterProxyModel::simpleFilterInvalidation()
-+{
-+ QStandardItemModel model;
-+ for (int i = 0; i < 2; ++i) {
-+ QStandardItem *child = new QStandardItem(QString("Row %1").arg(i));
-+ child->appendRow(new QStandardItem("child"));
-+ model.appendRow(child);
-+ }
-+
-+ FilterProxy2 proxy;
-+ proxy.setSourceModel(&model);
-+
-+ QTreeView view;
-+ view.setModel(&proxy);
-+
-+ view.show();
-+ QTest::qWaitForWindowShown(&view);
-+
-+ proxy.setMode(true);
-+ model.insertRow(0, new QStandardItem("extra"));
-+}
-+
-+
- QTEST_MAIN(tst_QSortFilterProxyModel)
- #include "tst_qsortfilterproxymodel.moc"
--
1.8.0
More information about the arch-commits
mailing list