diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-03-27 13:57:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 17:28:00 +0200 |
| commit | 4a46b15514368a99295d1ca9a94927d8d6cf6cd8 (patch) | |
| tree | d0b4878abb1bc992d83555b219df759e177535e6 /src/plugins/platforms/windows/qwindowsfontengine.h | |
| parent | 5f19e2c8f314f2b9cb3498faf782922a354c9c4d (diff) | |
Make QWindowsMultiFontEngine support deferred fallback families query
This finishes 800232e1d3ebfbac28d07014a3c646ea00fcf6ad, which encovered
a tricky issue in QFontEngineMultiQPA::createMultiFontEngine().
Task-number: QTBUG-37836
Change-Id: I6d432e09e755f5d9ded09752c4c092f4857ad224
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontengine.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontengine.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontengine.h b/src/plugins/platforms/windows/qwindowsfontengine.h index 7d93484220..7a0803830c 100644 --- a/src/plugins/platforms/windows/qwindowsfontengine.h +++ b/src/plugins/platforms/windows/qwindowsfontengine.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/private/qfontengine_p.h> +#include <QtGui/private/qfontengine_qpa_p.h> #include <QtGui/QImage> #include <QtCore/QSharedPointer> @@ -166,15 +166,13 @@ private: mutable int designAdvancesSize; }; -class QWindowsMultiFontEngine : public QFontEngineMulti + +class QWindowsMultiFontEngine : public QFontEngineMultiQPA { public: - QWindowsMultiFontEngine(QFontEngine *first, const QStringList &fallbacks); + explicit QWindowsMultiFontEngine(QFontEngine *fe, int script); - void setFallbackFamiliesList(const QStringList &fallbacks); void loadEngine(int at); - - QStringList fallbackFamilies; }; QT_END_NAMESPACE |