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/qtableview/tst_qtableview.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/qtableview/tst_qtableview.cpp')
| -rw-r--r-- | tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp index 9038ae3b00..74511fc87d 100644 --- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp +++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp @@ -54,10 +54,8 @@ #endif typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) typedef QList<bool> BoolList; -Q_DECLARE_METATYPE(BoolList) class tst_QTableView : public QObject { @@ -787,7 +785,6 @@ void tst_QTableView::headerSections() } typedef QPair<int,int> IntPair; -Q_DECLARE_METATYPE(IntPair) void tst_QTableView::moveCursor_data() { @@ -1849,7 +1846,6 @@ void tst_QTableView::selectColumn() QCOMPARE(view.selectionModel()->selectedIndexes().at(i).column(), column); } -Q_DECLARE_METATYPE(QRect) void tst_QTableView::visualRect_data() { QTest::addColumn<int>("rowCount"); @@ -2925,7 +2921,6 @@ void tst_QTableView::span() } typedef QVector<QRect> SpanList; -Q_DECLARE_METATYPE(SpanList) void tst_QTableView::spans_data() { |