From 6384c4e94041e588d1defbfd3b4dbbe2f611715c Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Tue, 30 Jun 2015 10:42:41 +0200
Subject: [PATCH] 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>
---
 src/corelib/kernel/qmetatype.cpp |  6 ------
 src/corelib/kernel/qpointer.cpp  |  2 +-
 src/gui/text/qtextlayout.cpp     | 14 ++++++++++++++
 src/testlib/qtestcase.cpp        |  4 ++--
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 58912e3fb7f..641053371d0 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -1178,12 +1178,6 @@ bool QMetaType::isRegistered(int type)
     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>
 static inline int qMetaTypeTypeImpl(const char *typeName, int length)
 {
diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp
index 39cc17f7dd1..f237498f4e5 100644
--- a/src/corelib/kernel/qpointer.cpp
+++ b/src/corelib/kernel/qpointer.cpp
@@ -128,7 +128,7 @@
 */
 
 /*!
-    \fn void QPointer::swap(QPointer<T> &other)
+    \fn void QPointer::swap(QPointer &other)
     \since 5.6
 
     Swaps the contents of this QPointer with the contents of \a other.
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 9d2199ec547..d56b9cf1b12 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -87,6 +87,20 @@ QT_BEGIN_NAMESPACE
     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
     \reentrant
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 4790f6f456c..6634597c5ee 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -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
 
     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
     simulate events for \a widget.