diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-07 08:31:13 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-04-07 09:38:34 +0000 |
| commit | 191a21047863cd327d3e8102b08dbf20a4c6e0a5 (patch) | |
| tree | 9be92e3111992951d87571ebbcf1e2859901050f /src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h | |
| parent | dea78262e52da38de47301e206459967aa6719bb (diff) | |
| parent | 5d6073be27cb951b692bbcc4dc0dd54cc09c9fd4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h')
| -rw-r--r-- | src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h index 3a432842e5..2df81274ad 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h @@ -51,13 +51,13 @@ // We mean it. // -#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h> +#include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h> #include <QtCore/QSharedPointer> #include <QtCore/qt_windows.h> QT_BEGIN_NAMESPACE -class QWindowsFontDatabaseFT : public QBasicFontDatabase +class QWindowsFontDatabaseFT : public QFreeTypeFontDatabase { public: void populateFontDatabase() Q_DECL_OVERRIDE; |