6 files changed, 19 insertions, 6 deletions
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/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp
index 93af1a9600b..0c6d9a31316 100644
--- a/src/gui/text/windows/qwindowsfontdatabase.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabase.cpp
@@ -1113,17 +1113,21 @@ void QWindowsFontDatabase::removeApplicationFonts()
     m_eudcFonts.clear();
 }
 
+#if QT_CONFIG(directwrite)
 QWindowsFontDatabase::FontHandle::FontHandle(IDWriteFontFace *face, const QString &name)
     : fontFace(face), faceName(name)
 {
     fontFace->AddRef();
 }
+#endif // !QT_NO_DIRECTWRITE
 
 
 QWindowsFontDatabase::FontHandle::~FontHandle()
 {
+#if QT_CONFIG(directwrite)
     if (fontFace != nullptr)
         fontFace->Release();
+#endif // !QT_NO_DIRECTWRITE
 }
 
 void QWindowsFontDatabase::releaseHandle(void *handle)
diff --git a/src/gui/text/windows/qwindowsfontdatabase_p.h b/src/gui/text/windows/qwindowsfontdatabase_p.h
index 92e3f04f968..856a5593722 100644
--- a/src/gui/text/windows/qwindowsfontdatabase_p.h
+++ b/src/gui/text/windows/qwindowsfontdatabase_p.h
@@ -78,10 +78,14 @@ public:
 
     struct FontHandle {
         FontHandle(const QString &name) : faceName(name) {}
+#if QT_CONFIG(directwrite)
         FontHandle(IDWriteFontFace *face, const QString &name);
+#endif // !QT_NO_DIRECTWRITE
         ~FontHandle();
 
+#if QT_CONFIG(directwrite)
         IDWriteFontFace *fontFace = nullptr;
+#endif // !QT_NO_DIRECTWRITE
         QString faceName;
     };