summaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/gui/graphicsview/qgraphicsitem
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-21 14:33:56 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-22 05:55:24 +0000
commit574c2e7feed83dfc1cf216497adf442bd7659b77 (patch)
tree567a9bf9e2801ae383a856dfa24827b9233a056a /tests/benchmarks/gui/graphicsview/qgraphicsitem
parentd21e6cf5584a2b93ea9175ae94b4855126e6904b (diff)
QGraphicsView tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.
Fix usage of API that is marked deprecated. Change-Id: Ib9a45e93084fb5b0d0d3aefd64b755dff7c696d6 Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Diffstat (limited to 'tests/benchmarks/gui/graphicsview/qgraphicsitem')
-rw-r--r--tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro1
-rw-r--r--tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp14
2 files changed, 9 insertions, 6 deletions
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
index 1d02be4918..461ec13263 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
@@ -4,4 +4,3 @@ TEMPLATE = app
TARGET = tst_bench_qgraphicsitem
SOURCES += tst_qgraphicsitem.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index ac6cafe09b..7e58c2dc83 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -114,7 +114,7 @@ void tst_QGraphicsItem::setParentItem_deep()
childRect->setParentItem(lastRect);
lastRect = childRect;
}
- QGraphicsItem *first = rect.children().first();
+ QGraphicsItem *first = rect.childItems().first();
first->setParentItem(0);
}
}
@@ -194,8 +194,9 @@ void tst_QGraphicsItem::rotate()
QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
processEvents();
+ const QTransform rotate(QTransform().rotate(45));
QBENCHMARK {
- item->rotate(45);
+ item->setTransform(rotate, true);
}
}
@@ -205,8 +206,9 @@ void tst_QGraphicsItem::scale()
QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
processEvents();
+ const QTransform scale(QTransform::fromScale(2, 2));
QBENCHMARK {
- item->scale(2, 2);
+ item->setTransform(scale, true);
}
}
@@ -216,8 +218,9 @@ void tst_QGraphicsItem::shear()
QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
processEvents();
+ const QTransform shear = QTransform().shear(1.5, 1.5);
QBENCHMARK {
- item->shear(1.5, 1.5);
+ item->setTransform(shear, true);
}
}
@@ -227,8 +230,9 @@ void tst_QGraphicsItem::translate()
QGraphicsItem *item = scene.addRect(QRectF(0, 0, 100, 100));
processEvents();
+ const QTransform translate = QTransform::fromTranslate(100, 100);
QBENCHMARK {
- item->translate(100, 100);
+ item->setTransform(translate, true);
}
}