diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-11 01:00:10 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-12-11 14:52:25 +0100 |
| commit | 5b193e3dd47704daf56c8817d0157f66363044c3 (patch) | |
| tree | 88d81d23ebe62a3decda01c4066599e0c4d81299 /tests/benchmarks | |
| parent | c3a66baff87e8d231aae06ccd1eb5d623587593d (diff) | |
| parent | a4a7c1bcf7595e2645c570d9c824532acf524fdf (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
Diffstat (limited to 'tests/benchmarks')
| -rw-r--r-- | tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp index 1d47d98657..8f8e8300a1 100644 --- a/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp +++ b/tests/benchmarks/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp @@ -30,7 +30,7 @@ #include <QtTest/QtTest> #include <QtCore/private/qmemory_p.h> #include <mutex> -#if QT_HAS_INCLUDE(<shared_mutex>) +#if __has_include(<shared_mutex>) #if __cplusplus > 201103L #include <shared_mutex> #endif |