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/thread/qmutex.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/thread/qmutex.h')
| -rw-r--r-- | src/corelib/thread/qmutex.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 036fde729b0..ce7b5275ac2 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -9,10 +9,8 @@ #include <QtCore/qtsan_impl.h> #include <new> -#if __has_include(<chrono>) -# include <chrono> -# include <limits> -#endif +#include <chrono> +#include <limits> class tst_QMutex; @@ -31,7 +29,6 @@ class QMutex; class QRecursiveMutex; class QMutexPrivate; -#if __has_include(<chrono>) namespace QtPrivate { template<class Rep, class Period> @@ -57,7 +54,6 @@ namespace QtPrivate return ms < maxInt ? int(ms) : maxInt; } } -#endif class Q_CORE_EXPORT QBasicMutex { |