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/qobject.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/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 7fa2790208..358f151495 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -20,9 +20,7 @@ #include <QtCore/qobject_impl.h> #include <QtCore/qbindingstorage.h> -#if __has_include(<chrono>) -# include <chrono> -#endif +#include <chrono> QT_BEGIN_NAMESPACE @@ -128,13 +126,11 @@ public: void moveToThread(QThread *thread); int startTimer(int interval, Qt::TimerType timerType = Qt::CoarseTimer); -#if __has_include(<chrono>) Q_ALWAYS_INLINE int startTimer(std::chrono::milliseconds time, Qt::TimerType timerType = Qt::CoarseTimer) { return startTimer(int(time.count()), timerType); } -#endif void killTimer(int id); template<typename T> |