Fix a bunch of qdoc warnings from QList types

For documentation purposes, we treat QList, QByteArrayList, and QStringList as
simple classes, whereas reality is a bit more complicated. We conditionally
change the declaration of the types for qdoc runs, and need to be consistent
to avoid a flood of warnings from clang when building documentation.

Change-Id: I22d529079e10f8fd3d93edc771e5f05729fa925f
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

2 files changed, 11 insertions, 0 deletions

diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h
index 46c2801b00..575cd1def9 100644
--- a/src/corelib/tools/qcontainerfwd.h
+++ b/src/corelib/tools/qcontainerfwd.h
@@ -61,8 +61,13 @@ template <class T> class QStack;
 template<class T, qsizetype Prealloc = 256> class QVarLengthArray;
 template <class T> class QList;
 template<typename T> using QVector = QList<T>;
+#ifndef Q_CLANG_QDOC
 using QStringList = QList<QString>;
 using QByteArrayList = QList<QByteArray>;
+#else
+class QStringList;
+class QByteArrayList;
+#endif
 class QMetaType;
 class QVariant;
 
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 5bdc993b67..3f621e71fb 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -302,9 +302,15 @@ public:
 
     QList<T> &fill(parameter_type t, qsizetype size = -1);
 
+#ifndef Q_QDOC
     using QListSpecialMethods<T>::contains;
     using QListSpecialMethods<T>::indexOf;
     using QListSpecialMethods<T>::lastIndexOf;
+#else
+    qsizetype indexOf(const T &t, qsizetype from = 0) const noexcept;
+    qsizetype lastIndexOf(const T &t, qsizetype from = -1) const noexcept;
+    bool contains(const T &t) const noexcept;
+#endif
 
     qsizetype count(const T &t) const noexcept
     {