QDeadlineTimer: use if constexpr instead of function specializations

You can't partially specialize a template function, so these
specializations for steady_clock only worked if the Duration parameter
was nanoseconds. This could have been solved with function overloads
instead, but I find the if constexpr code simpler to read.

Pick-to: 6.5
Change-Id: Ieec322d73c1e40ad95c8fffd17468bd73fc2fe24
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp b/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
index 2627d6beca..ab8adfc75b 100644
--- a/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
+++ b/tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
@@ -679,6 +679,14 @@ void tst_QDeadlineTimer::stdchrono()
     QCOMPARE_LT(deadline.deadline<steady_clock>(), (steady_clock::now() + 5ms * minResolution));
     QCOMPARE_GT(deadline.deadline<system_clock>(), (system_clock::now() + 3ms * minResolution));
     QCOMPARE_LT(deadline.deadline<system_clock>(), (system_clock::now() + 5ms * minResolution));
+    QCOMPARE_GT((deadline.deadline<steady_clock, milliseconds>()),
+                steady_clock::now() + 3ms * minResolution);
+    QCOMPARE_LT((deadline.deadline<steady_clock, milliseconds>()),
+                steady_clock::now() + 5ms * minResolution);
+    QCOMPARE_GT((deadline.deadline<system_clock, milliseconds>()),
+                system_clock::now() + 3ms * minResolution);
+    QCOMPARE_LT((deadline.deadline<system_clock, milliseconds>()),
+                system_clock::now() + 5ms * minResolution);
     if (timerType == Qt::CoarseTimer) {
         QCOMPARE_GT(deadline, now + 3ms * minResolution);
         QCOMPARE_LT(deadline, now + 5ms * minResolution);