From 643b6e5b291669c0decda1ed827ec2a98cfc6e29 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sat, 4 Mar 2023 11:20:36 +0100 Subject: [PATCH] Silence warnings from unused variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use them, or replace them with existing constants. Pick-to: 6.5 Change-Id: I808028296305e15b68aecb1f961ba6a85b8e9cc7 Reviewed-by: Thiago Macieira Reviewed-by: Øystein Heskestad Reviewed-by: Volker Hilsheimer --- tests/benchmarks/corelib/kernel/events/tst_bench_events.cpp | 1 + .../thread/qthreadstorage/tst_bench_qthreadstorage.cpp | 1 + tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt | 1 + .../benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/benchmarks/corelib/kernel/events/tst_bench_events.cpp b/tests/benchmarks/corelib/kernel/events/tst_bench_events.cpp index 0b310afb94b..b6fa503d1d6 100644 --- a/tests/benchmarks/corelib/kernel/events/tst_bench_events.cpp +++ b/tests/benchmarks/corelib/kernel/events/tst_bench_events.cpp @@ -88,6 +88,7 @@ void EventsBench::noEvent() QBENCHMARK { val += tst.foo(1); } + QVERIFY(val > 0); } void EventsBench::sendEvent_data() diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/tst_bench_qthreadstorage.cpp b/tests/benchmarks/corelib/thread/qthreadstorage/tst_bench_qthreadstorage.cpp index 1361013833d..724d587dd1e 100644 --- a/tests/benchmarks/corelib/thread/qthreadstorage/tst_bench_qthreadstorage.cpp +++ b/tests/benchmarks/corelib/thread/qthreadstorage/tst_bench_qthreadstorage.cpp @@ -64,6 +64,7 @@ void tst_QThreadStorage::get() int *i = ts.localData(); count += *i; } + QVERIFY(count > 0); ts.setLocalData(0); } diff --git a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt index 9fe26fe5e17..14c0b9c7306 100644 --- a/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt +++ b/tests/benchmarks/corelib/time/qdatetime/CMakeLists.txt @@ -10,4 +10,5 @@ qt_internal_add_benchmark(tst_bench_qdatetime tst_bench_qdatetime.cpp LIBRARIES Qt::Test + Qt::CorePrivate ) diff --git a/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp b/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp index 1213f3b1337..822477c8fdd 100644 --- a/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp +++ b/tests/benchmarks/corelib/time/qdatetime/tst_bench_qdatetime.cpp @@ -6,6 +6,7 @@ #include #include #include +#include class tst_QDateTime : public QObject { @@ -67,8 +68,7 @@ private Q_SLOTS: void fromMSecsSinceEpochTz(); }; -constexpr qint64 SECS_PER_DAY = 86400; -constexpr qint64 MSECS_PER_DAY = 86400000; +using namespace QtPrivate::DateTimeConstants; constexpr qint64 JULIAN_DAY_1 = 1721426; constexpr qint64 JULIAN_DAY_11 = 1725078; constexpr qint64 JULIAN_DAY_1890 = 2411369;