1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix [[nodiscard]] compile errors in QLocale benchmark

Browse Source 
QString::toUpper() now insists we use its return, so the benchmark
won't compile unless we do so. Also document the helper macro used by
the tests, to explain why it's even there at all.

Change-Id: I830f121d92867bcd09277ecdeb1c764413b34fa6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
This commit is contained in:
Edward Welbourne 2020-10-14 15:19:29 +02:00
parent 55e16b25f5
commit 5a948dd50b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/benchmarks/corelib/text/qlocale/main.cpp
View File

@ -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 QtCore module of the Qt Toolkit.
@ -44,25 +44,26 @@ static QString data()
return QStringLiteral("/qt-5/qtbase/tests/benchmarks/corelib/tools/qlocale");
}
// Make individual cycles O(a few) msecs, rather than tiny fractions thereof:
#define LOOP(s) for (int i = 0; i < 5000; ++i) { s; }
void tst_QLocale::toUpper_QLocale_1()
{
QString s = data();
QBENCHMARK { LOOP(QLocale().toUpper(s)) }
QBENCHMARK { LOOP(QString t(QLocale().toUpper(s))) }
}
void tst_QLocale::toUpper_QLocale_2()
{
QString s = data();
QLocale l;
QBENCHMARK { LOOP(l.toUpper(s)) }
QBENCHMARK { LOOP(QString t(l.toUpper(s))) }
}
void tst_QLocale::toUpper_QString()
{
QString s = data();
QBENCHMARK { LOOP(s.toUpper()) }
QBENCHMARK { LOOP(QString t(s.toUpper())) }
}
QTEST_MAIN(tst_QLocale)