Use the lazily-queried families for all QPA multi font engines.

This is the approach introduced together with the  WebKit "backdoor"
that lets us use QRawFont with QTextLayout. We could use it all
over the place and share more code.

Change-Id: Ie1963679755f37ba9204d67554a163f1d1115604
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/gui/text/qfontengine_qpa_p.h b/src/gui/text/qfontengine_qpa_p.h
index 16991ad2ca..e6907149b2 100644
--- a/src/gui/text/qfontengine_qpa_p.h
+++ b/src/gui/text/qfontengine_qpa_p.h
@@ -247,6 +247,7 @@ class Q_GUI_EXPORT QFontEngineMultiQPA : public QFontEngineMulti
 {
 public:
     QFontEngineMultiQPA(QFontEngine *fe, int script, const QStringList &fallbacks);
+    QFontEngineMultiQPA(QFontEngine *fe, int script);
 
     void loadEngine(int at);
     static QFontEngine* createMultiFontEngine(QFontEngine *fe, int script);
@@ -254,13 +255,15 @@ public:
     int fallbackFamilyCount() const { return fallbackFamilies.size(); }
     QString fallbackFamilyAt(int at) const { return fallbackFamilies.at(at); }
 
+    virtual void ensureFallbackFamiliesQueried();
+    virtual void setFallbackFamiliesList(const QStringList &fallbacks);
+
 private:
-    QFontEngineMultiQPA(QFontEngine *fe, int script);
     void init(QFontEngine *fe);
 
-    QStringList fallbackFamilies;
+    mutable QStringList fallbackFamilies;
     int script;
-    bool fallbacksQueried;
+    mutable bool fallbacksQueried;
 };
 
 QT_END_NAMESPACE