5 files changed, 12 insertions, 29 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index b079e317d7..a2290f0241 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1154,11 +1154,23 @@ Q_DECL_CONSTEXPR inline int qRound(double d)
 { return d >= 0.0 ? int(d + 0.5) : int(d - int(d-1) + 0.5) + int(d-1); }
 Q_DECL_CONSTEXPR inline int qRound(float d)
 { return d >= 0.0f ? int(d + 0.5f) : int(d - int(d-1) + 0.5f) + int(d-1); }
+#ifdef Q_QDOC
+/*
+    Just for documentation generation
+*/
+int qRound(qreal d);
+#endif
 
 Q_DECL_CONSTEXPR inline qint64 qRound64(double d)
 { return d >= 0.0 ? qint64(d + 0.5) : qint64(d - double(qint64(d-1)) + 0.5) + qint64(d-1); }
 Q_DECL_CONSTEXPR inline qint64 qRound64(float d)
 { return d >= 0.0f ? qint64(d + 0.5f) : qint64(d - float(qint64(d-1)) + 0.5f) + qint64(d-1); }
+#ifdef Q_QDOC
+/*
+    Just for documentation generation
+*/
+qint64 qRound64(qreal d);
+#endif
 
 template <typename T>
 Q_DECL_CONSTEXPR inline const T &qMin(const T &a, const T &b) { return (a < b) ? a : b; }
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 0ee851fd14..7d925f380b 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -375,11 +375,6 @@ QFileInfo::~QFileInfo()
 */
 
 /*!
-    \overload
-    \fn bool QFileInfo::operator!=(const QFileInfo &fileinfo) const
-*/
-
-/*!
     Returns true if this QFileInfo object refers to a file in the same
     location as \a fileinfo; otherwise returns false.
 
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 6a3a463f6b..2796902590 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -939,12 +939,6 @@ bool QTranslator::isEmpty() const
            !d->offsetArray && !d->contextArray;
 }
 
-/*!
-    \fn QString QTranslator::find(const char *context, const char *sourceText, const char * comment = 0) const
-
-    Use translate(\a context, \a sourceText, \a comment) instead.
-*/
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_TRANSLATION
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index 580dc37bd2..9eeb783b60 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -1121,18 +1121,6 @@ QFunctionPointer QLibrary::resolve(const QString &fileName, const QString &versi
 }
 
 /*!
-    \fn QString QLibrary::library() const
-
-    Use fileName() instead.
-*/
-
-/*!
-    \fn void QLibrary::setAutoUnload( bool b )
-
-    Use load(), isLoaded(), and unload() as necessary instead.
-*/
-
-/*!
     \since 4.2
 
     Returns a text string with the description of the last error that occurred.
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp
index 7c1bde4ac7..2b40a68e0b 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/tools/qstringbuilder.cpp
@@ -101,12 +101,6 @@ QT_BEGIN_NAMESPACE
   characters.
  */
 
-/*!
-    \fn operator QStringBuilder::QString() const
- 
-    Converts the \c QLatin1String into a \c QString object.
-*/
-
 /*! \internal
  */
 void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out)