QFontEngine: get rid of userData() trickery

it is only used by QWin32PrintEngine and we know for sure
QWindowsFontEngine::handle() returns HFONT

Change-Id: I7656801e4642caf7df612d2f686061dca92707e0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

2 files changed, 0 insertions, 12 deletions

diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 5d73e2cf8e..9b71a2fd0d 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -356,14 +356,11 @@ public:
     GlyphFormat glyphFormat;
     int m_subPixelPositionCount; // Number of positions within a single pixel for this cache
 
-    inline QVariant userData() const { return m_userData; }
-
 protected:
     explicit QFontEngine(Type type);
 
     QFixed lastRightBearing(const QGlyphLayout &glyphs);
 
-    inline void setUserData(const QVariant &userData) { m_userData = userData; }
     QFixed calculatedCapHeight() const;
 
     mutable QFixed m_ascent;
@@ -390,8 +387,6 @@ private:
     mutable QHash<const void *, GlyphCaches> m_glyphCaches;
 
 private:
-    QVariant m_userData;
-
     mutable qreal m_minLeftBearing;
     mutable qreal m_minRightBearing;
 };
diff --git a/src/gui/text/windows/qwindowsfontengine.cpp b/src/gui/text/windows/qwindowsfontengine.cpp
index dd0fbbf262..46774fa304 100644
--- a/src/gui/text/windows/qwindowsfontengine.cpp
+++ b/src/gui/text/windows/qwindowsfontengine.cpp
@@ -255,13 +255,6 @@ QWindowsFontEngine::QWindowsFontEngine(const QString &name,
     if (!resolvedGetCharWidthI)
         resolveGetCharWidthI();
 
-    // ### Properties accessed by QWin32PrintEngine (QtPrintSupport)
-    QVariantMap userData;
-    userData.insert(QStringLiteral("logFont"), QVariant::fromValue(m_logfont));
-    userData.insert(QStringLiteral("hFont"), QVariant::fromValue(hfont));
-    userData.insert(QStringLiteral("trueType"), QVariant(bool(ttf)));
-    setUserData(userData);
-
     hasUnreliableOutline = (tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR)) == 0;
 }