[arch-commits] Commit in qt/kde-unstable (PKGBUILD fix-filtering.patch)

[Andrea Scarpino]

    Date: Friday, January 7, 2011 @ 22:12:38
  Author: andrea
Revision: 105355

upgpkg: qt 4.7.1-4
does not patch tests

Modified:
  qt/kde-unstable/PKGBUILD
  qt/kde-unstable/fix-filtering.patch

---------------------+
 PKGBUILD            |    2 -
 fix-filtering.patch |   77 --------------------------------------------------
 2 files changed, 1 insertion(+), 78 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-08 02:20:26 UTC (rev 105354)
+++ PKGBUILD	2011-01-08 03:12:38 UTC (rev 105355)
@@ -35,7 +35,7 @@
          '6b771c8a81dd90b45e8a79afa0e5bbfd'
          'c359d7b8c3a7fdd99512feaab8c2e26b'
          'ae3bb58e7b63786d420905baf083fcd2'
-         'c5c34077811d37a6ba4c156d0018e7c2')
+         '8a0d56caa411ac3ef7f3eb6713055f4c')
 
 build() {
 	unset QMAKESPEC

Modified: fix-filtering.patch
===================================================================
--- fix-filtering.patch	2011-01-08 02:20:26 UTC (rev 105354)
+++ fix-filtering.patch	2011-01-08 03:12:38 UTC (rev 105355)
@@ -34,83 +34,6 @@
              if (orient == Qt::Horizontal) {
                  // We're reacting to columnsInserted, but we've just inserted new rows. Sort them.
                  sort_source_rows(orthogonal_proxy_to_source, source_parent);
-diff --git a/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro
-index d2c1147..7edd4a5 100644
---- a/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro
-+++ b/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro
-@@ -1,6 +1,7 @@
- load(qttest_p4)
- 
--SOURCES += tst_qsortfilterproxymodel.cpp
--
-+INCLUDEPATH += $$PWD/../modeltest
- 
-+SOURCES         += tst_qsortfilterproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
-+HEADERS         += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
- 
-diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-index 66caf4a..93b9d30 100644
---- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
-@@ -43,6 +43,9 @@
- #include <QtTest/QtTest>
- #include "../../shared/util.h"
- 
-+#include "dynamictreemodel.h"
-+#include "modeltest.h"
-+
- #include <QtCore>
- #include <QtGui>
- 
-@@ -144,6 +147,7 @@ private slots:
- 
-     void testMultipleProxiesWithSelection();
-     void mapSelectionFromSource();
-+    void filteredColumns();
- 
- protected:
-     void buildHierarchy(const QStringList &data, QAbstractItemModel *model);
-@@ -3174,5 +3178,40 @@ void tst_QSortFilterProxyModel::taskQTBUG_10287_unnecessaryMapCreation()
-     // No assert failure, it passes.
- }
- 
-+class FilteredColumnProxyModel : public QSortFilterProxyModel
-+{
-+  Q_OBJECT
-+public:
-+  FilteredColumnProxyModel(QObject *parent = 0)
-+    : QSortFilterProxyModel(parent)
-+  {
-+
-+  }
-+
-+protected:
-+  bool filterAcceptsColumn(int column, const QModelIndex &source_parent) const
-+  {
-+    return column % 2 != 0;
-+  }
-+};
-+
-+void tst_QSortFilterProxyModel::filteredColumns()
-+{
-+    DynamicTreeModel *model = new DynamicTreeModel(this);
-+
-+    FilteredColumnProxyModel *proxy = new FilteredColumnProxyModel(this);
-+    proxy->setSourceModel(model);
-+
-+    new ModelTest(proxy, this);
-+
-+    ModelInsertCommand *insertCommand = new ModelInsertCommand(model, this);
-+    insertCommand->setNumCols(2);
-+    insertCommand->setStartRow(0);
-+    insertCommand->setEndRow(0);
-+    // Parent is QModelIndex()
-+    insertCommand->doCommand();
-+
-+}
-+
- QTEST_MAIN(tst_QSortFilterProxyModel)
- #include "tst_qsortfilterproxymodel.moc"
 -- 
 1.6.1