diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-23 13:54:47 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-27 11:20:35 +0200 |
| commit | 02c2c930f0874a8886cb0983606c38cb8b356cd7 (patch) | |
| tree | 501d5fc16f2ba14f02bb27a75964ffe8993510d0 /tests/manual/qgraphicslayout/flicker/window.cpp | |
| parent | 2059170b33ffb05b99d9a3e1e374eb5a4bce9163 (diff) | |
Fix some compiler errors caused by bit-rot in manual tests
Two methods that have gone away or been renamed,
an enum that now doesn't support being assigned from int.
QTime should no longer be used as a timer.
Removed a test of deprecated code that's gone away.
Task-number: QTBUG-85700
Change-Id: Idc6d59542625d22b9937084411b54b0d8aa87f00
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/manual/qgraphicslayout/flicker/window.cpp')
| -rw-r--r-- | tests/manual/qgraphicslayout/flicker/window.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/manual/qgraphicslayout/flicker/window.cpp b/tests/manual/qgraphicslayout/flicker/window.cpp index 32d12f35ee..f5f4131ab7 100644 --- a/tests/manual/qgraphicslayout/flicker/window.cpp +++ b/tests/manual/qgraphicslayout/flicker/window.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. @@ -41,7 +41,7 @@ void SlowWidget::setGeometry(const QRectF &rect) qDebug() << "currentBenchmarkIteration:" << stats.currentBenchmarkIteration; if (stats.currentBenchmarkIteration == m_window->m_benchmarkIterationsSpinBox->value()) { if (stats.output) - stats.output->setText(tr("DONE. Elapsed: %1, setGeometryCount: %2").arg(stats.time.elapsed()).arg(stats.setGeometryCount)); + stats.output->setText(tr("DONE. Elapsed: %1, setGeometryCount: %2").arg(stats.timer.elapsed()).arg(stats.setGeometryCount)); } else { reiterate = true; } @@ -57,4 +57,3 @@ void SlowWidget::setGeometry(const QRectF &rect) //QTimer::singleShot(0, m_window, SLOT(doAgain())); } } - |