diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qproperty.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 356eb43cd3..4358182c25 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -56,7 +56,7 @@ #endif #endif -#if !defined(QT_PROPERTY_COLLECT_BINDING_LOCATION) && __has_include(<experimental/source_location>) && __cplusplus >= 201703L && !defined(Q_CLANG_QDOC) +#if !defined(QT_PROPERTY_COLLECT_BINDING_LOCATION) && __has_include(<experimental/source_location>) && !defined(Q_CLANG_QDOC) #include <experimental/source_location> #if defined(__cpp_lib_experimental_source_location) #define QT_SOURCE_LOCATION_NAMESPACE std::experimental diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index d8ef892cb7..213368a036 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -58,7 +58,7 @@ #include <memory> #include <type_traits> -#if __has_include(<variant>) && __cplusplus >= 201703L +#if __has_include(<variant>) #include <variant> #elif defined(Q_CLANG_QDOC) namespace std { template<typename...> struct variant; } @@ -402,7 +402,7 @@ class Q_CORE_EXPORT QVariant return QVariant(QMetaType::fromType<T>(), std::addressof(value)); } -#if (__has_include(<variant>) && __cplusplus >= 201703L) || defined(Q_CLANG_QDOC) +#if __has_include(<variant>) || defined(Q_CLANG_QDOC) template<typename... Types> static inline QVariant fromStdVariant(const std::variant<Types...> &value) { @@ -580,7 +580,7 @@ inline QVariant QVariant::fromValue(const QVariant &value) return value; } -#if __has_include(<variant>) && __cplusplus >= 201703L +#if __has_include(<variant>) template<> inline QVariant QVariant::fromValue(const std::monostate &) { |