diff options
| author | Konrad Kujawa <konrad.kujawa@qt.io> | 2022-09-14 09:49:00 +0200 |
|---|---|---|
| committer | Konrad Kujawa <konrad.kujawa@qt.io> | 2022-09-16 08:09:05 +0200 |
| commit | ec2af0a9df0ac7bf9036f59a94ac3f3ef45c6740 (patch) | |
| tree | 04f83ec54c289e3739f84f78c825ee1a25f15337 /tests/auto/corelib/kernel/qtimer | |
| parent | 22d4c67234fd152296c3ec98fc57526356a9f62b (diff) | |
Remove preprocessor conditionals for chrono include
__has_include(<chrono>) is always true, because C++11 chrono include
is required since 6.0.
Pick-to: 6.4 6.3 6.2
Change-Id: I50cb92571bf4f1f86e2f3f2b5f486dd3c3f30f4a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qtimer')
| -rw-r--r-- | tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index c91aba4790..03a6f1b5aa 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -240,19 +240,14 @@ void tst_QTimer::remainingTimeDuringActivation() namespace { -#if __has_include(<chrono>) template <typename T> std::chrono::milliseconds to_ms(T t) { return std::chrono::duration_cast<std::chrono::milliseconds>(t); } -#endif } // unnamed namespace void tst_QTimer::basic_chrono() { -#if !__has_include(<chrono>) - QSKIP("This test requires C++11 <chrono> support"); -#else // duplicates zeroTimer, singleShotTimeout, interval and remainingTime using namespace std::chrono; QTimer timer; @@ -293,7 +288,6 @@ void tst_QTimer::basic_chrono() QCOMPARE(timeoutSpy.count(), 1); QTest::qWait(500); QCOMPARE(timeoutSpy.count(), 1); -#endif } void tst_QTimer::livelock_data() @@ -890,9 +884,6 @@ void tst_QTimer::singleShotToFunctors() void tst_QTimer::singleShot_chrono() { -#if !__has_include(<chrono>) - QSKIP("This test requires C++11 <chrono> support"); -#else // duplicates singleShotStaticFunctionZeroTimeout and singleShotToFunctors using namespace std::chrono; { @@ -929,7 +920,6 @@ void tst_QTimer::singleShot_chrono() QTRY_COMPARE(count, 3); _e.reset(); -#endif } class DontBlockEvents : public QObject |