diff options
author | Martin Smith <martin.smith@qt.io> | 2018-10-09 09:24:28 +0000 |
---|---|---|
committer | Martin Smith <martin.smith@qt.io> | 2018-10-09 10:12:48 +0000 |
commit | eeb6ceb1927dc14fda17bcdf45baf692b2d459e2 (patch) | |
tree | 07bbce75e0378dc30bca70d397777685ea123791 /src/corelib/kernel/qvariant.h | |
parent | 4f2e0117f9b842d9aa2a9bb04aabd9fb09774f1d (diff) |
Revert "qdoc: Add default include dirs to qdoc command line"
This reverts commit 4bdd8d4ecac42be9e93faa7a2b9ae3448c4f989e.
It contains an error.
Change-Id: I51052029f001b9e82c2a53de15b4ba354aafdbae
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
-rw-r--r-- | src/corelib/kernel/qvariant.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index f92eb1a340..ff73c27b6e 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -365,7 +365,7 @@ class Q_CORE_EXPORT QVariant static inline QVariant fromValue(const T &value) { return qVariantFromValue(value); } -#if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L +#if defined(Q_CLANG_QDOC) || (QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L) template<typename... Types> static inline QVariant fromStdVariant(const std::variant<Types...> &value) { |