diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-17 20:10:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-17 20:10:34 +0100 |
| commit | bc4cd465dd5df82e13f3c7709166ee11289d219f (patch) | |
| tree | d6323aaed6383e589fbefb6057648c22bb187c76 /src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | |
| parent | 43daefb0962794b2df256cae1098e889b9b36f12 (diff) | |
| parent | 07745d7bfbf6c8d83e0243150d8ce934675dea87 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
qmake/Makefile.unix
Change-Id: Ia18e391198222eef34ffa2df6f683e052058d032
Diffstat (limited to 'src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp')
| -rw-r--r-- | src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index 60ddc9fa233..0826b0f2fb4 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -49,8 +49,7 @@ #include <QtCore/QtEndian> #undef QT_NO_FREETYPE -#include <QtGui/private/qfontengine_ft_p.h> -#include <QtGui/private/qfontengine_p.h> +#include <QtFontDatabaseSupport/private/qfontengine_ft_p.h> #include <ft2build.h> #include FT_TRUETYPE_TABLES_H |