diff options
Diffstat (limited to 'tests/auto/widgets/graphicsview')
10 files changed, 1 insertions, 29 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp index 5321e5b008..dd62715b05 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp @@ -309,7 +309,6 @@ typedef QList<ItemDesc> ItemList; Q_DECLARE_METATYPE(ItemList); typedef QList<QSizeF> SizeList; -Q_DECLARE_METATYPE(SizeList); // This will be called before the first test function is executed. @@ -2223,7 +2222,6 @@ void tst_QGraphicsGridLayout::defaultStretchFactors() } typedef QList<QRectF> RectList; -Q_DECLARE_METATYPE(RectList); void tst_QGraphicsGridLayout::alignment2_data() { diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index 2d379d3c07..670369a584 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -67,11 +67,7 @@ #include <float.h> #include <QStyleHints> -Q_DECLARE_METATYPE(QList<int>) -Q_DECLARE_METATYPE(QList<QRectF>) Q_DECLARE_METATYPE(QPainterPath) -Q_DECLARE_METATYPE(QPointF) -Q_DECLARE_METATYPE(QRectF) #include "../../../qtest-config.h" diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index eef70b822a..fa9157a5cc 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -1053,8 +1053,6 @@ void tst_QGraphicsLinearLayout::itemSpacing() */ typedef QList<int> IntList; -Q_DECLARE_METATYPE(IntList) -Q_DECLARE_METATYPE(qreal) void tst_QGraphicsLinearLayout::setStretchFactor_data() { diff --git a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp index d07b919a4d..5b82048867 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp @@ -370,7 +370,6 @@ void tst_QGraphicsPixmapItem::shape() } Q_DECLARE_METATYPE(SubQGraphicsPixmapItem::Extension) -Q_DECLARE_METATYPE(QVariant) void tst_QGraphicsPixmapItem::extension_data() { QTest::addColumn<QVariant>("variant"); diff --git a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp index bc091a08be..4cb651c479 100644 --- a/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp @@ -44,7 +44,6 @@ #include <qgraphicsitem.h> #include <qpen.h> -Q_DECLARE_METATYPE(QPolygonF) class tst_QGraphicsPolygonItem : public QObject { @@ -292,7 +291,6 @@ void tst_QGraphicsPolygonItem::shape() QCOMPARE(item.shape(), shape); } -Q_DECLARE_METATYPE(QVariant) void tst_QGraphicsPolygonItem::extension_data() { QTest::addColumn<QVariant>("variant"); diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 0a832957ea..79459cd4b6 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -2747,7 +2747,6 @@ void tst_QGraphicsProxyWidget::autoShow() } -Q_DECLARE_METATYPE(QList<QRectF>) void tst_QGraphicsProxyWidget::windowOpacity() { QGraphicsScene scene; diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index 586dfedbf9..af21e88598 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -63,12 +63,8 @@ #define Q_CHECK_PAINTEVENTS #endif -Q_DECLARE_METATYPE(QList<int>) -Q_DECLARE_METATYPE(QList<QRectF>) -Q_DECLARE_METATYPE(QMatrix) +Q_DECLARE_METATYPE(Qt::FocusReason) Q_DECLARE_METATYPE(QPainterPath) -Q_DECLARE_METATYPE(QPointF) -Q_DECLARE_METATYPE(QRectF) Q_DECLARE_METATYPE(Qt::AspectRatioMode) Q_DECLARE_METATYPE(Qt::ItemSelectionMode) diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 6521710fb8..7e7ec4f313 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -69,13 +69,7 @@ #include "../../../qtest-config.h" -Q_DECLARE_METATYPE(QList<int>) -Q_DECLARE_METATYPE(QList<QRectF>) -Q_DECLARE_METATYPE(QMatrix) Q_DECLARE_METATYPE(QPainterPath) -Q_DECLARE_METATYPE(QPointF) -Q_DECLARE_METATYPE(QPolygonF) -Q_DECLARE_METATYPE(QRectF) Q_DECLARE_METATYPE(Qt::ScrollBarPolicy) #ifdef Q_OS_MAC diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp index 2a66ce32db..3149937bdc 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp @@ -45,12 +45,7 @@ #include <QtGui/QGuiApplication> #include <QtGui/QScreen> -Q_DECLARE_METATYPE(QList<int>) -Q_DECLARE_METATYPE(QList<QRectF>) -Q_DECLARE_METATYPE(QMatrix) Q_DECLARE_METATYPE(QPainterPath) -Q_DECLARE_METATYPE(QPointF) -Q_DECLARE_METATYPE(QRectF) Q_DECLARE_METATYPE(Qt::ScrollBarPolicy) static void _scrollBarRanges_data_1(int offset) diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 901bb7c38a..841e2e900c 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() { |