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<QStringConverter::Flag>' to 'QFlags<QStringConverterBase::Flag>' for 1st argument
src/corelib/text/qstringconverter.h:75:9: note: candidate constructor not viable: no known conversion from 'QStringConverter::Flags' (aka 'QFlags<QStringConverter::Flag>') 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<QStringConverter::Flag>') 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 <edward.welbourne@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Friedemann Kleint 2020-07-20 17:22:47 +02:00
parent 2c2e7ffb22
commit 07bef8b383
3 changed files with 3 additions and 3 deletions

View File

@ -400,7 +400,7 @@ public:
{}
#else
template <typename Functor>
explicit QProperty(Class *owner, Functor &&f);
explicit QNotifiedProperty(Class *owner, Functor &&f);
#endif
~QNotifiedProperty() = default;

View File

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

View File

@ -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 <QtGui/qwindowdefs_win.h>
#endif // Q_OS_WIN