diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-07 15:18:16 +0100 |
| commit | cdf13ce286b14273e1e29c5bb02cbc880f31b786 (patch) | |
| tree | 10733cb3fb35647b19cfd15ab158f56b1cb550e1 /tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp | |
| parent | 21d607c81af0cd285e9bb3869ac3cd18358f1c8f (diff) | |
| parent | a8321f21fb82714771b4717c99dd475f2c74649e (diff) | |
Merge branch 'stable' into dev
Conflicts:
tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47
Diffstat (limited to 'tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp')
| -rw-r--r-- | tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp index ccc28da3fe..e602438475 100644 --- a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp +++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp @@ -121,10 +121,6 @@ void tst_QDirModel::getSetCheck() QCOMPARE(true, obj1.lazyChildCount()); } - -Q_DECLARE_METATYPE(QModelIndex) -Q_DECLARE_METATYPE(QModelIndexList) - void tst_QDirModel::cleanupTestCase() { QDir current; @@ -464,7 +460,6 @@ void tst_QDirModel::rowsAboutToBeRemoved() QDirModel model; model.setReadOnly(false); - qRegisterMetaType<QModelIndex>("QModelIndex"); // NOTE: QDirModel will call refresh() when a file is removed. refresh() will reread the entire directory, // and emit layoutAboutToBeChanged and layoutChange. So, instead of checking for |