diff options
author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-02 07:36:48 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-02 07:36:48 +0200 |
commit | d6f58e5e17d58c640fc7779652008fda0d66f41d (patch) | |
tree | d50d27e260c9eaf4bc2bcb4480b8a069a3aed857 /src/plugins/platforms/windows/qwindowsfontengine.h | |
parent | 83de197a57ff6c3e5bbad26bd871981285384fcb (diff) | |
parent | 0ab63b035a649dc1982c867cd37d466d249004b9 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
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 |