diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 11:39:16 +0100 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-13 11:39:16 +0100 |
commit | d369ae7b831744c796571aa86b5d6570b09e70e4 (patch) | |
tree | 0ad8abef937ac3009f32b600a8e3b5644d7c637c /tests/auto/qsortfilterproxymodel | |
parent | c8a2533cb39ce0c7479880cd889ad594d569ecc0 (diff) | |
parent | 044708cb7f7fd1f2d7b18d20269422e7f3a1cb83 (diff) | |
download | qt4-tools-d369ae7b831744c796571aa86b5d6570b09e70e4.tar.gz |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
Diffstat (limited to 'tests/auto/qsortfilterproxymodel')
-rw-r--r-- | tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro | 5 | ||||
-rw-r--r-- | tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp | 37 |
2 files changed, 40 insertions, 2 deletions
diff --git a/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro index d2c1147028..7edd4a53cc 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 bc6ba77837..9a904dbe49 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> @@ -145,6 +148,7 @@ private slots: void testMultipleProxiesWithSelection(); void mapSelectionFromSource(); void testResetInternalData(); + void filteredColumns(); protected: void buildHierarchy(const QStringList &data, QAbstractItemModel *model); @@ -3311,7 +3315,40 @@ void tst_QSortFilterProxyModel::testResetInternalData() // Cause the source model to reset. model.setStringList(QStringList() << "Spam" << "Eggs"); +} + +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) |