qdoc:Fixed a few qdoc errors
Fixed a few qdoc error messages caused by errors in qmetatype.cpp and qtextlayout.cpp and qtestcase.cpp and qpointer.cpp Change-Id: I662aa25bedba057e125e289c34787e81793941ff Task-number: QTBUG-46939 Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
parent
899153b6f9
commit
6384c4e940
@ -1178,12 +1178,6 @@ bool QMetaType::isRegistered(int type)
|
|||||||
return ((type >= User) && (ct && ct->count() > type - User) && !ct->at(type - User).typeName.isEmpty());
|
return ((type >= User) && (ct && ct->count() > type - User) && !ct->at(type - User).typeName.isEmpty());
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
|
||||||
\fn int qMetaTypeTypeImpl(const char *typeName, int length)
|
|
||||||
\internal
|
|
||||||
|
|
||||||
Implementation of QMetaType::type().
|
|
||||||
*/
|
|
||||||
template <bool tryNormalizedType>
|
template <bool tryNormalizedType>
|
||||||
static inline int qMetaTypeTypeImpl(const char *typeName, int length)
|
static inline int qMetaTypeTypeImpl(const char *typeName, int length)
|
||||||
{
|
{
|
||||||
|
@ -128,7 +128,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\fn void QPointer::swap(QPointer<T> &other)
|
\fn void QPointer::swap(QPointer &other)
|
||||||
\since 5.6
|
\since 5.6
|
||||||
|
|
||||||
Swaps the contents of this QPointer with the contents of \a other.
|
Swaps the contents of this QPointer with the contents of \a other.
|
||||||
|
@ -87,6 +87,20 @@ QT_BEGIN_NAMESPACE
|
|||||||
Specifies the format to apply.
|
Specifies the format to apply.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/*! \fn bool operator==(const FormatRange &lhs, const FormatRange &rhs)
|
||||||
|
\relates QTextLayout::FormatRange
|
||||||
|
|
||||||
|
Returns true if the \c {start}, \c {length}, and \c {format} fields
|
||||||
|
in \a lhs and \a rhs contain the same values respectively.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*! \fn bool operator!=(const FormatRange &lhs, const FormatRange &rhs)
|
||||||
|
\relates QTextLayout::FormatRange
|
||||||
|
|
||||||
|
Returns true if any of the \c {start}, \c {length}, or \c {format} fields
|
||||||
|
in \a lhs and \a rhs contain different values respectively.
|
||||||
|
*/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class QTextInlineObject
|
\class QTextInlineObject
|
||||||
\reentrant
|
\reentrant
|
||||||
|
@ -1318,7 +1318,7 @@ static void stackTrace()
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\fn QTouchEventSequence QTest::touchEvent(QWindow *window, QTouchDevice *device, bool autoCommit = true)
|
\fn QTouchEventSequence QTest::touchEvent(QWindow *window, QTouchDevice *device, bool autoCommit)
|
||||||
\since 5.0
|
\since 5.0
|
||||||
|
|
||||||
Creates and returns a QTouchEventSequence for the \a device to
|
Creates and returns a QTouchEventSequence for the \a device to
|
||||||
@ -1335,7 +1335,7 @@ static void stackTrace()
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\fn QTouchEventSequence QTest::touchEvent(QWidget *widget, QTouchDevice *device, bool autoCommit = true)
|
\fn QTouchEventSequence QTest::touchEvent(QWidget *widget, QTouchDevice *device, bool autoCommit)
|
||||||
|
|
||||||
Creates and returns a QTouchEventSequence for the \a device to
|
Creates and returns a QTouchEventSequence for the \a device to
|
||||||
simulate events for \a widget.
|
simulate events for \a widget.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user