16 files changed, 48 insertions, 7 deletions
diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index 24d9d522735..8b7569c1296 100644
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -50,7 +50,8 @@ depends += \
     qtshadertools \
     qttestlib \
     qtplatformintegration \
-    qthelp
+    qthelp \
+    qtquickcontrols
 
 headerdirs  += ..
 
diff --git a/src/gui/doc/src/external-resources.qdoc b/src/gui/doc/src/external-resources.qdoc
index 0f356dd5046..14ed0817e62 100644
--- a/src/gui/doc/src/external-resources.qdoc
+++ b/src/gui/doc/src/external-resources.qdoc
@@ -36,6 +36,7 @@
     \externalpage https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
     \title Freedesktop Icon Naming Specification
 */
+
 /*!
     \externalpage https://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#directory_layout
     \title Icon Theme Specification - Directory Layout
diff --git a/src/gui/itemmodels/qfileinfogatherer.cpp b/src/gui/itemmodels/qfileinfogatherer.cpp
index b7ab3dbbc46..ea19db0d20f 100644
--- a/src/gui/itemmodels/qfileinfogatherer.cpp
+++ b/src/gui/itemmodels/qfileinfogatherer.cpp
@@ -46,6 +46,12 @@ static QString translateDriveName(const QFileInfo &drive)
 }
 
 /*!
+    \class QFileInfoGatherer
+    \inmodule QtGui
+    \internal
+*/
+
+/*!
     Creates thread
 */
 QFileInfoGatherer::QFileInfoGatherer(QObject *parent)
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 741b089306e..e8df40f21b2 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -490,6 +490,12 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
 */
 
 /*!
+    \class QGuiApplicationPrivate
+    \inmodule QtGui
+    \internal
+*/
+
+/*!
     Initializes the window system and constructs an application object with
     \a argc command line arguments in \a argv.
 
diff --git a/src/gui/kernel/qplatformintegrationfactory.cpp b/src/gui/kernel/qplatformintegrationfactory.cpp
index d0a5e8871f8..d113e86090d 100644
--- a/src/gui/kernel/qplatformintegrationfactory.cpp
+++ b/src/gui/kernel/qplatformintegrationfactory.cpp
@@ -24,6 +24,7 @@ QPlatformIntegration *QPlatformIntegrationFactory::create(const QString &platfor
 }
 
 /*!
+    \internal
     Returns the list of valid keys, i.e. the keys this factory can
     create styles for.
 
diff --git a/src/gui/kernel/qplatformthemefactory.cpp b/src/gui/kernel/qplatformthemefactory.cpp
index beefa1c2942..3ac462598fd 100644
--- a/src/gui/kernel/qplatformthemefactory.cpp
+++ b/src/gui/kernel/qplatformthemefactory.cpp
@@ -31,6 +31,7 @@ QPlatformTheme *QPlatformThemeFactory::create(const QString& key, const QString
 }
 
 /*!
+    \internal
     Returns the list of valid keys, i.e. the keys this factory can
     create styles for.
 
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp
index 6b45d26fb4c..cb927d7c296 100644
--- a/src/gui/opengl/qopenglfunctions.cpp
+++ b/src/gui/opengl/qopenglfunctions.cpp
@@ -192,6 +192,12 @@ QOpenGLFunctions::QOpenGLFunctions(QOpenGLContext *context)
         qWarning("QOpenGLFunctions created with non-current context");
 }
 
+/*!
+    \class QOpenGLExtensions
+    \inmodule QtGui
+    \internal
+*/
+
 QOpenGLExtensions::QOpenGLExtensions()
 {
 }
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 047be5f1c3d..8e815394849 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -2881,6 +2881,7 @@ bool QRasterPaintEngine::drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs,
 
 
 /*!
+ * \internal
  * Returns \c true if the rectangle is completely within the current clip
  * state of the paint engine.
  */
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index 908051a477c..b1ea3f240f1 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -3192,6 +3192,7 @@ static inline bool is_monochrome(const QList<QRgb> &colorTable)
 }
 
 /*!
+ * \internal
  * Adds an image to the pdf and return the pdf-object id. Returns -1 if adding the image failed.
  */
 int QPdfEnginePrivate::addImage(const QImage &img, bool *bitmap, bool lossless, qint64 serial_no)
diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp
index 0d435c95048..08128c30a70 100644
--- a/src/gui/painting/qstroker.cpp
+++ b/src/gui/painting/qstroker.cpp
@@ -145,6 +145,11 @@ static inline qreal adapted_angle_on_x(const QLineF &line)
     return QLineF(0, 0, 1, 0).angleTo(line);
 }
 
+/*!
+    \class QStrokerOps
+    \inmodule QtGui
+    \internal
+*/
 QStrokerOps::QStrokerOps()
     : m_elements(0)
     , m_curveThreshold(qt_real_to_fixed(0.25))
@@ -373,6 +378,7 @@ QStroker::LineJoinMode QStroker::joinModeForJoin(Qt::PenJoinStyle joinStyle)
 
 
 /*!
+    \internal
     This function is called to stroke the currently built up
     subpath. The subpath is cleared when the function completes.
 */
diff --git a/src/gui/platform/unix/dbusmenu/qdbusplatformmenu.cpp b/src/gui/platform/unix/dbusmenu/qdbusplatformmenu.cpp
index fe050461260..00c3192e00a 100644
--- a/src/gui/platform/unix/dbusmenu/qdbusplatformmenu.cpp
+++ b/src/gui/platform/unix/dbusmenu/qdbusplatformmenu.cpp
@@ -48,6 +48,7 @@ void QDBusPlatformMenuItem::setIcon(const QIcon &icon)
 }
 
 /*!
+    \internal
     Set a submenu under this menu item.
 */
 void QDBusPlatformMenuItem::setMenu(QPlatformMenu *menu)
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index d41296291f6..4df55d5b89c 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -402,7 +402,7 @@ bool QFontEngine::processHheaTable() const
 
         const qreal unitsPerEm = emSquareSize().toReal();
         // Bail out if values are too large for QFixed
-        const auto limitForQFixed = qreal(std::numeric_limits<int>::max() / 64) / fontDef.pixelSize;
+        const auto limitForQFixed = qreal(std::numeric_limits<int>::max() >> 6) / fontDef.pixelSize;
         if (ascent > limitForQFixed || descent > limitForQFixed || leading > limitForQFixed)
             return false;
         m_ascent = QFixed::fromReal(ascent * fontDef.pixelSize / unitsPerEm);
@@ -470,7 +470,7 @@ bool QFontEngine::processOS2Table() const
             if (typoAscent == 0 && typoDescent == 0)
                 return false;
             // Bail out if values are too large for QFixed
-            const auto limitForQFixed = qreal(std::numeric_limits<int>::max() / 64) / fontDef.pixelSize;
+            const auto limitForQFixed = qreal(std::numeric_limits<int>::max() >> 6) / fontDef.pixelSize;
             if (typoAscent > limitForQFixed || typoDescent > limitForQFixed
                     || typoLineGap > limitForQFixed)
                 return false;
@@ -481,7 +481,7 @@ bool QFontEngine::processOS2Table() const
             // Some fonts may have invalid OS/2 data. We detect this and bail out.
             if (winAscent == 0 && winDescent == 0)
                 return false;
-            const auto limitForQFixed = qreal(std::numeric_limits<int>::max() / 64) / fontDef.pixelSize;
+            const auto limitForQFixed = qreal(std::numeric_limits<int>::max() >> 6) / fontDef.pixelSize;
             if (winAscent > limitForQFixed || winDescent > limitForQFixed)
                 return false;
             m_ascent = QFixed::fromReal(winAscent * fontDef.pixelSize / unitsPerEm);
@@ -1059,6 +1059,7 @@ void QFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metr
 }
 
 /*!
+    \internal
     Returns \c true if the font table idetified by \a tag exists in the font;
     returns \c false otherwise.
 
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 4f01d09fed1..d519cd5a5d3 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -2385,6 +2385,11 @@ static QString colorValue(QColor color)
     return result;
 }
 
+/*!
+    \class QTextHtmlExporter
+    \inmodule QtGui
+    \internal
+*/
 QTextHtmlExporter::QTextHtmlExporter(const QTextDocument *_doc)
     : doc(_doc), fragmentMarkers(false)
 {
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 227cbae2952..85a74d366ac 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -1006,6 +1006,7 @@ int QTextDocumentPrivate::undoRedo(bool undo)
 }
 
 /*!
+    \internal
     Appends a custom undo \a item to the undo stack.
 */
 void QTextDocumentPrivate::appendUndoItem(QAbstractUndoItem *item)
diff --git a/src/gui/text/qtexttable.cpp b/src/gui/text/qtexttable.cpp
index ff8644b5302..337228ff170 100644
--- a/src/gui/text/qtexttable.cpp
+++ b/src/gui/text/qtexttable.cpp
@@ -394,11 +394,9 @@ void QTextTablePrivate::fragmentRemoved(QChar type, uint fragment)
 }
 
 /*!
-    /fn void QTextTablePrivate::update() const
-
+    \internal
     This function is usually called when the table is "dirty".
     It seems to update all kind of table information.
-
 */
 void QTextTablePrivate::update() const
 {
diff --git a/src/gui/util/qlayoutpolicy.cpp b/src/gui/util/qlayoutpolicy.cpp
index 4d81a426835..0c0651c1f39 100644
--- a/src/gui/util/qlayoutpolicy.cpp
+++ b/src/gui/util/qlayoutpolicy.cpp
@@ -8,6 +8,11 @@
 
 QT_BEGIN_NAMESPACE
 
+/*!
+    \class QLayoutPolicy
+    \inmodule QtGui
+    \internal
+*/
 void QLayoutPolicy::setControlType(ControlType type)
 {
     /*