diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-18 10:41:09 +0300 |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-18 10:41:09 +0300 |
| commit | 9cacde74f7de702689725882633073e60c0a2baa (patch) | |
| tree | 330d22dadbd28b14a7d8896823d1c33597e9993e /tests/auto/qdirmodel | |
| parent | 006c8e22075112eff6230d8168d716e44a9e29d5 (diff) | |
| parent | 2c07b5d2cba8d8e499bd0861eefef12d4e00d99a (diff) | |
Merge remote-tracking branch 'qt/4.8'
Conflicts:
doc/src/examples/wheel.qdoc
src/gui/util/qflickgesture.cpp
src/gui/util/qflickgesture_p.h
src/gui/util/qscroller.cpp
src/gui/util/qscroller.h
src/gui/util/qscroller_p.h
src/gui/util/qscrollerproperties.cpp
src/gui/util/qscrollerproperties.h
tests/auto/qscroller/tst_qscroller.cpp
Diffstat (limited to 'tests/auto/qdirmodel')
| -rw-r--r-- | tests/auto/qdirmodel/tst_qdirmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/qdirmodel/tst_qdirmodel.cpp index 4e50a61f06..db424a2af7 100644 --- a/tests/auto/qdirmodel/tst_qdirmodel.cpp +++ b/tests/auto/qdirmodel/tst_qdirmodel.cpp @@ -641,10 +641,10 @@ void tst_QDirModel::filter() QDirModel model; model.setNameFilters(QStringList() << "*.nada"); QModelIndex index = model.index(SRCDIR "test"); - Q_ASSERT(model.rowCount(index) == 0); + QCOMPARE(model.rowCount(index), 0); QModelIndex index2 = model.index(SRCDIR "test/file01.tst"); - Q_ASSERT(!index2.isValid()); - Q_ASSERT(model.rowCount(index) == 0); + QVERIFY(!index2.isValid()); + QCOMPARE(model.rowCount(index), 0); } void tst_QDirModel::task244669_remove() |