AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "qdoc: Add default include dirs to qdoc command line"

Browse Source 
This reverts commit 4bdd8d4eca.

It contains an error.

Change-Id: I51052029f001b9e82c2a53de15b4ba354aafdbae
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
This commit is contained in:
Martin Smith 2018-10-09 09:24:28 +00:00
parent 4f2e0117f9
commit eeb6ceb192
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/qt_docs.prf
View File

@ -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)

2
src/corelib/kernel/qvariant.h
View File

@ -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)
{