5 files changed, 13 insertions, 11 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index e162015aba..9ede90d8de 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -2707,7 +2707,7 @@ bool QFontInfo::fixedPitch() const
         QChar ch[2] = { QLatin1Char('i'), QLatin1Char('m') };
         QGlyphLayoutArray<2> g;
         int l = 2;
-        if (!engine->stringToCMap(ch, 2, &g, &l, 0))
+        if (!engine->stringToCMap(ch, 2, &g, &l, {}))
             Q_UNREACHABLE();
         Q_ASSERT(l == 2);
         engine->fontDef.fixedPitch = g.advances[0] == g.advances[1];
diff --git a/src/gui/text/qfontengine_qpf2.cpp b/src/gui/text/qfontengine_qpf2.cpp
index 68bf3f9e73..d636bca510 100644
--- a/src/gui/text/qfontengine_qpf2.cpp
+++ b/src/gui/text/qfontengine_qpf2.cpp
@@ -456,7 +456,7 @@ glyph_metrics_t QFontEngineQPF2::boundingBox(glyph_t glyph)
 
 QFixed QFontEngineQPF2::ascent() const
 {
-    return QFixed::fromReal(extractHeaderField(fontData, Tag_Ascent).value<qreal>());
+    return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_Ascent)));
 }
 
 QFixed QFontEngineQPF2::capHeight() const
@@ -466,37 +466,37 @@ QFixed QFontEngineQPF2::capHeight() const
 
 QFixed QFontEngineQPF2::descent() const
 {
-    return QFixed::fromReal(extractHeaderField(fontData, Tag_Descent).value<qreal>());
+    return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_Descent)));
 }
 
 QFixed QFontEngineQPF2::leading() const
 {
-    return QFixed::fromReal(extractHeaderField(fontData, Tag_Leading).value<qreal>());
+    return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_Leading)));
 }
 
 qreal QFontEngineQPF2::maxCharWidth() const
 {
-    return extractHeaderField(fontData, Tag_MaxCharWidth).value<qreal>();
+    return qvariant_cast<qreal>(extractHeaderField(fontData, Tag_MaxCharWidth));
 }
 
 qreal QFontEngineQPF2::minLeftBearing() const
 {
-    return extractHeaderField(fontData, Tag_MinLeftBearing).value<qreal>();
+    return qvariant_cast<qreal>(extractHeaderField(fontData, Tag_MinLeftBearing));
 }
 
 qreal QFontEngineQPF2::minRightBearing() const
 {
-    return extractHeaderField(fontData, Tag_MinRightBearing).value<qreal>();
+    return qvariant_cast<qreal>(extractHeaderField(fontData, Tag_MinRightBearing));
 }
 
 QFixed QFontEngineQPF2::underlinePosition() const
 {
-    return QFixed::fromReal(extractHeaderField(fontData, Tag_UnderlinePosition).value<qreal>());
+    return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_UnderlinePosition)));
 }
 
 QFixed QFontEngineQPF2::lineThickness() const
 {
-    return QFixed::fromReal(extractHeaderField(fontData, Tag_LineThickness).value<qreal>());
+    return QFixed::fromReal(qvariant_cast<qreal>(extractHeaderField(fontData, Tag_LineThickness)));
 }
 
 bool QFontEngineQPF2::isValid() const
diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp
index c345e89a21..b50957d63d 100644
--- a/src/gui/text/qsyntaxhighlighter.cpp
+++ b/src/gui/text/qsyntaxhighlighter.cpp
@@ -299,7 +299,7 @@ QSyntaxHighlighter::QSyntaxHighlighter(QObject *parent)
     : QObject(*new QSyntaxHighlighterPrivate, parent)
 {
     if (parent && parent->inherits("QTextEdit")) {
-        QTextDocument *doc = parent->property("document").value<QTextDocument *>();
+        QTextDocument *doc = qvariant_cast<QTextDocument *>(parent->property("document"));
         if (doc)
             setDocument(doc);
     }
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 1d27cc30eb..f2caedc25f 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -3085,7 +3085,7 @@ void QTextDocumentPrivate::mergeCachedResources(const QTextDocumentPrivate *priv
     if (!priv)
         return;
 
-    cachedResources.unite(priv->cachedResources);
+    cachedResources.insert(priv->cachedResources);
 }
 
 void QTextHtmlExporter::emitBackgroundAttribute(const QTextFormat &format)
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index 7d46238257..2459c78768 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -221,7 +221,9 @@ public:
 
     bool isModified() const;
 
+#ifndef QT_NO_PRINTER
     void print(QPagedPaintDevice *printer) const;
+#endif
 
     enum ResourceType {
         UnknownResource = 0,