diff options
Diffstat (limited to 'tests/benchmarks/gui/graphicsview')
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp index f7701d9f7f..b8bd55789d 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/button.cpp @@ -123,7 +123,7 @@ QSizeF Button::sizeHint(Qt::SizeHint which, case Qt::PreferredSize: { QFontMetricsF fm(d->textItem->font()); - return QSizeF(fm.width(d->textItem->text()), fm.height()); + return QSizeF(fm.horizontalAdvance(d->textItem->text()), fm.height()); } default: return QGraphicsWidget::sizeHint(which, constraint); diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp index 7b0dcd5afa..5fb2ee1a51 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp @@ -73,7 +73,7 @@ QSizeF Label::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const // fall thru case Qt::PreferredSize: { QFontMetricsF fm(m_textItem->font()); - return QSizeF(fm.width(m_textItem->text()), fm.height()); + return QSizeF(fm.horizontalAdvance(m_textItem->text()), fm.height()); } default: return GvbWidget::sizeHint(which, constraint); diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp index 622df2fb3b..6145fabbf8 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp @@ -216,7 +216,7 @@ void tst_QGraphicsScene::itemAt() QGraphicsItem *item = 0; QBENCHMARK { - item = scene.items(QPointF(0, 0)).value(0, Q_NULLPTR); + item = scene.items(QPointF(0, 0)).value(0, nullptr); } //let QGraphicsScene::_q_polishItems be called so ~QGraphicsItem doesn't spend all his time cleaning the unpolished list |