diff options
| author | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-09-30 14:11:14 +0200 |
|---|---|---|
| committer | Ievgenii Meshcheriakov <ievgenii.meshcheriakov@qt.io> | 2021-10-01 02:46:09 +0200 |
| commit | 44a74127954dce2416842a6644cbdff4c513b6fb (patch) | |
| tree | b97491cf7d9e566e6ff24e622feb5c86933ca594 /tests/auto | |
| parent | 79f62380f09988949bc601060ff5131cf34de872 (diff) | |
Remove checks for C++ standard versions C++17 and below
Qt requires a compiler that support C++17 thus __cplusplus
is always 201703L or higher. This patch removes checks
for __cplusplus value that always succeed.
Change-Id: I4b830683ecefab8f913d8b09604086d53209d2e3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp index 53c59d5170..cc2bac8e2b 100644 --- a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp +++ b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp @@ -35,7 +35,7 @@ #if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) #include <source_location> #define QT_SOURCE_LOCATION_NAMESPACE std -#elif __has_include(<experimental/source_location>) && __cplusplus >= 201703L && !defined(Q_CLANG_QDOC) +#elif __has_include(<experimental/source_location>) && !defined(Q_CLANG_QDOC) #include <experimental/source_location> #define QT_SOURCE_LOCATION_NAMESPACE std::experimental #endif diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 5ca08b4e62..40dfb79cff 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -48,7 +48,7 @@ #include <limits.h> #include <float.h> #include <cmath> -#if __has_include(<variant>) && __cplusplus >= 201703L +#if __has_include(<variant>) #include <variant> #endif #include <QRegularExpression> @@ -4882,7 +4882,7 @@ void tst_QVariant::shouldDeleteVariantDataWorksForAssociative() void tst_QVariant::fromStdVariant() { -#if __has_include(<variant>) && __cplusplus >= 201703L +#if __has_include(<variant>) { typedef std::variant<int, bool> intorbool_t; intorbool_t stdvar = 5; |