diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-02-10 20:39:02 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-10 20:39:02 +0000 |
| commit | 095dbc494c6cb9815b0d9b521a3105b06f4bef33 (patch) | |
| tree | ec5b2ac5777406a533e820f21b5705b209855a0d /src/corelib/kernel/qvariant.h | |
| parent | 0b48fcee709ac0070d7b9213632edeafeeddc9e1 (diff) | |
| parent | 32b506d1db1f8cee748a27b548ba8208f2928058 (diff) | |
Merge "Merge remote-tracking branch 'origin/dev' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 29e67e9dd8..fe1ef1bdfc 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -53,6 +53,10 @@ #include <QtCore/qbytearraylist.h> #endif +#if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L +#include <variant> +#endif + QT_BEGIN_NAMESPACE @@ -355,6 +359,16 @@ class Q_CORE_EXPORT QVariant static inline QVariant fromValue(const T &value) { return qVariantFromValue(value); } +#if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L + template<typename... Types> + static inline QVariant fromStdVariant(const std::variant<Types...> &value) + { + if (value.valueless_by_exception()) + return QVariant(); + return std::visit([](const auto &arg) { return fromValue(arg); }, value); + } +#endif + template<typename T> bool canConvert() const { return canConvert(qMetaTypeId<T>()); } @@ -503,6 +517,11 @@ inline QVariant qVariantFromValue(const T &t) template <> inline QVariant qVariantFromValue(const QVariant &t) { return t; } +#if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L +template <> +inline QVariant qVariantFromValue(const std::monostate &) { return QVariant(); } +#endif + template <typename T> inline void qVariantSetValue(QVariant &v, const T &t) { |