From 574c2e7feed83dfc1cf216497adf442bd7659b77 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Fri, 21 Aug 2015 14:33:56 +0200
Subject: 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>
---
 .../graphicsview/qgraphicsview/benchapps/chipTest/chip.pro    |  1 -
 .../qgraphicsview/benchapps/moveItems/moveItems.pro           |  1 -
 .../qgraphicsview/benchapps/scrolltest/scrolltest.pro         |  1 -
 .../gui/graphicsview/qgraphicsview/chiptester/chip.cpp        |  2 +-
 .../gui/graphicsview/qgraphicsview/qgraphicsview.pro          |  1 -
 .../gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp      | 11 ++++++-----
 6 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'tests/benchmarks/gui/graphicsview/qgraphicsview')

diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
index 4047bad1ca..8ef79cef23 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/chip.pro
@@ -17,4 +17,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images
 sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/chip
 INSTALLS += target sources
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro
index 55e50d275b..28dcadcbfa 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/moveItems.pro
@@ -1,2 +1 @@
 SOURCES += main.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro
index 55e50d275b..28dcadcbfa 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/scrolltest.pro
@@ -1,2 +1 @@
 SOURCES += main.cpp
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
index 42c4b88eda..24daf90b68 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
@@ -43,7 +43,7 @@ Chip::Chip(const QColor &color, int x, int y)
     setZValue((x + y) % 2);
 
     setFlags(ItemIsSelectable | ItemIsMovable);
-    setAcceptsHoverEvents(true);
+    setAcceptHoverEvents(true);
 }
 
 QRectF Chip::boundingRect() const
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
index e68b90cbc5..3d48959f3c 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
@@ -7,4 +7,3 @@ SOURCES += tst_qgraphicsview.cpp
 RESOURCES += qgraphicsview.qrc
 
 include(chiptester/chiptester.pri)
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index f8645d2507..3d6b38252f 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -166,7 +166,7 @@ void tst_QGraphicsView::initTestCase()
     mView.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     mView.tryResize(100, 100);
     mView.show();
-    QTest::qWaitForWindowShown(&mView);
+    QTest::qWaitForWindowExposed(&mView);
     QTest::qWait(300);
     processEvents();
 }
@@ -418,7 +418,7 @@ void tst_QGraphicsView::chipTester()
     tester.setOpenGL(opengl);
     tester.setOperation(ChipTester::Operation(operation));
     tester.show();
-    QTest::qWaitForWindowShown(&tester);
+    QTest::qWaitForWindowExposed(&tester);
     QTest::qWait(250);
     processEvents();
 
@@ -434,7 +434,7 @@ static void addChildHelper(QGraphicsItem *parent, int n, bool rotate)
     QGraphicsRectItem *item = new QGraphicsRectItem(QRectF(0, 0, 50, 50), parent);
     item->setPos(10, 10);
     if (rotate)
-        item->rotate(10);
+        item->setTransform(QTransform().rotate(10), true);
     addChildHelper(item, n - 1, rotate);
 }
 
@@ -464,7 +464,8 @@ void tst_QGraphicsView::deepNesting()
     for (int y = 0; y < 15; ++y) {
         for (int x = 0; x < 15; ++x) {
             QGraphicsItem *item1 = scene.addRect(QRectF(0, 0, 50, 50));
-            if (rotate) item1->rotate(10);
+            if (rotate)
+                item1->setTransform(QTransform().rotate(10), true);
             item1->setPos(x * 25, y * 25);
             addChildHelper(item1, 30, rotate);
         }
@@ -476,7 +477,7 @@ void tst_QGraphicsView::deepNesting()
     mView.setRenderHint(QPainter::Antialiasing);
     mView.setScene(&scene);
     mView.tryResize(600, 600);
-    (void)scene.itemAt(0, 0);
+    (void)scene.items(QPointF(0, 0));
     processEvents();
 
     QBENCHMARK {
-- 
cgit v1.2.3