From eeb6ceb1927dc14fda17bcdf45baf692b2d459e2 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@qt.io>
Date: Tue, 9 Oct 2018 09:24:28 +0000
Subject: [PATCH] Revert "qdoc: Add default include dirs to qdoc command line"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 4bdd8d4ecac42be9e93faa7a2b9ae3448c4f989e.

It contains an error.

Change-Id: I51052029f001b9e82c2a53de15b4ba354aafdbae
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 mkspecs/features/qt_docs.prf  | 6 ------
 src/corelib/kernel/qvariant.h | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index e4df3c0b48..3139c443c6 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -78,12 +78,6 @@ doc_command = $$QDOC $$QMAKE_DOCS
 prepare_docs {
     prepare_docs.commands += $$doc_command -prepare $$PREP_DOC_INDEXES -no-link-errors $(INCPATH)
     generate_docs.commands += $$doc_command -generate $$DOC_INDEXES $(INCPATH)
-    darwin {
-        for (incdir, $$QMAKE_DEFAULT_INCDIRS) {
-            prepare_docs.commands += -I$$shell_quote($$incdir)
-            generate_docs.commands += -I$$shell_quote($$incdir)
-        }
-    }
     prepare_docs.depends += qtattributionsscanner
 } else {
     html_docs.commands += $$doc_command $$DOC_INDEXES $(INCPATH)
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)
     {