diff options
Diffstat (limited to 'tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp')
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index f8645d2507..7f52bb0eba 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -1,31 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -166,7 +161,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 +413,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 +429,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 +459,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 +472,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 { |