From 07bef8b3838b0417f2b34eae1c690871737e5719 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 20 Jul 2020 17:22:47 +0200 Subject: [PATCH] Fix some qdoc warnings src/corelib/text/qstringconverter.h:160:54: error: no matching constructor for initialization of 'QStringConverterBase::State' src/corelib/text/qstringconverter.h:72:19: note: candidate constructor not viable: no known conversion from 'QFlags' to 'QFlags' for 1st argument src/corelib/text/qstringconverter.h:75:9: note: candidate constructor not viable: no known conversion from 'QStringConverter::Flags' (aka 'QFlags') to 'QStringConverterBase::State' for 1st argument src/corelib/text/qstringconverter.h:108:24: note: candidate constructor not viable: no known conversion from 'QStringConverter::Flags' (aka 'QFlags') to 'const QStringConverterBase::State' for 1st argument src/corelib/text/qstringconverter.h:159:32: warning: constexpr constructor that does not initialize all members is a C++20 extension [-Wc++20-extensions] src/corelib/text/qstringconverter.h:187:11: note: member not initialized by constructor src/corelib/kernel/qproperty.h:403:14: error: deduction guide must be declared in the same scope as template 'QProperty' src/corelib/kernel/qproperty.h:202:7: note: template is declared here src/corelib/kernel/qproperty.h:403:14: error: deduction guide declaration without trailing return type src/gui/painting/qregion.h:139:5: error: unknown type name 'HRGN' src/gui/painting/qregion.h:140:29: error: unknown type name 'HRGN' Change-Id: I3c195a60ceeb51664368a4aeef90c70c31954fc3 Reviewed-by: Edward Welbourne Reviewed-by: Paul Wicking --- src/corelib/kernel/qproperty.h | 2 +- src/corelib/text/qstringconverter.h | 2 +- src/gui/kernel/qwindowdefs.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index c2949c3022..ae7f3a5050 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -400,7 +400,7 @@ public: {} #else template - explicit QProperty(Class *owner, Functor &&f); + explicit QNotifiedProperty(Class *owner, Functor &&f); #endif ~QNotifiedProperty() = default; diff --git a/src/corelib/text/qstringconverter.h b/src/corelib/text/qstringconverter.h index 8766968e6d..9eba8bc437 100644 --- a/src/corelib/text/qstringconverter.h +++ b/src/corelib/text/qstringconverter.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE // work around a compiler bug in GCC 7 -#if defined(Q_CC_GNU) && __GNUC__ == 7 +#if (defined(Q_CC_GNU) && __GNUC__ == 7) || defined(Q_QDOC) #define QSTRINGCONVERTER_CONSTEXPR #else #define QSTRINGCONVERTER_CONSTEXPR constexpr diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h index 5d4955c436..172cc593d1 100644 --- a/src/gui/kernel/qwindowdefs.h +++ b/src/gui/kernel/qwindowdefs.h @@ -88,7 +88,7 @@ QT_END_NAMESPACE // Window system dependent definitions -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) || defined(Q_QDOC) # include #endif // Q_OS_WIN