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/graphicsview/qgraphicswidget/tst_qgraphicswidget.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/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp')
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index b7a9885b2a..3a23c222f9 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -1891,7 +1891,6 @@ enum WhichSize { typedef QPair<int, QVariant> Inst; Q_DECLARE_METATYPE(Inst) -Q_DECLARE_METATYPE(QVector<Inst>) void tst_QGraphicsWidget::setSizes_data() { |