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 /src/corelib/kernel/qtimer.h | |
| 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 'src/corelib/kernel/qtimer.h')
| -rw-r--r-- | src/corelib/kernel/qtimer.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index ca8a81c889..00c06186c3 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -11,9 +11,7 @@ #include <QtCore/qbasictimer.h> // conceptual inheritance #include <QtCore/qobject.h> -#if __has_include(<chrono>) -# include <chrono> -#endif +#include <chrono> QT_BEGIN_NAMESPACE @@ -145,7 +143,6 @@ Q_SIGNALS: void timeout(QPrivateSignal); public: -#if __has_include(<chrono>) || defined(Q_QDOC) void setInterval(std::chrono::milliseconds value) { setInterval(int(value.count())); @@ -175,7 +172,6 @@ public: { start(int(value.count())); } -#endif protected: void timerEvent(QTimerEvent *) override; @@ -192,7 +188,6 @@ private: static void singleShotImpl(int msec, Qt::TimerType timerType, const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj); -#if __has_include(<chrono>) static Qt::TimerType defaultTypeFor(std::chrono::milliseconds interval) { return defaultTypeFor(int(interval.count())); } @@ -202,7 +197,6 @@ private: singleShotImpl(int(interval.count()), timerType, receiver, slotObj); } -#endif }; QT_END_NAMESPACE |