Doc: Fix documentation warnings for Qt Core

qsocketnotifier.h:113:69: error: cannot initialize return object of type
    'Qt::HANDLE' (aka 'void *') with an lvalue of type 'const
    QSocketDescriptor::DescriptorType' (aka 'const int')

qsortfilterproxymodel.cpp:2938: error: out-of-line definition of
    'recursiveFilteringEnabledChanged' does not match any declaration in
    'QSortFilterProxyModel'

qline.cpp:376: (qdoc) warning: Cannot find 'QLineF::IntersectionType'
    specified with '\enum' in any header file

Fixes: QTBUG-83676
Change-Id: I57b51f4ad15fdc50db88100ad5b1cb85ed394b7a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Topi Reinio 2020-04-21 13:09:10 +02:00
parent 806bc5fc05
commit e10e5318bc
3 changed files with 11 additions and 4 deletions

View File

@ -2937,7 +2937,7 @@ void QSortFilterProxyModel::setFilterRole(int role)
/*!
\since 5.15
\fn void QSortFilterProxyModel::recursiveFilteringEnabledChanged(int recursiveFilteringEnabled)
\fn void QSortFilterProxyModel::recursiveFilteringEnabledChanged(bool recursiveFilteringEnabled)
\brief This signal is emitted when the recursive filter setting is changed
to \a recursiveFilteringEnabled.
*/

View File

@ -94,7 +94,7 @@ private:
class QSocketDescriptor
{
public:
#if defined(Q_OS_WIN)
#if defined(Q_OS_WIN) || defined(Q_QDOC)
using DescriptorType = Qt::HANDLE;
#define Q_DECL_CONSTEXPR_NOT_WIN
#else

View File

@ -370,11 +370,18 @@ QDataStream &operator>>(QDataStream &stream, QLine &line)
/*!
\enum QLineF::IntersectType
\obsolete Use QLineF::IntersectionType instead
\obsolete Use QLineF::IntersectionType instead.
\value NoIntersection
Lines do not intersect.
\value UnboundedIntersection
Lines intersect, but not within the range defined by their lengths.
\value BoundedIntersection
Lnes intersect within the range defined by their lengths.
*/
/*!
\enum QLineF::IntersectionType
\typealias QLineF::IntersectionType
Describes the intersection between two lines.