diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-20 13:35:27 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-25 12:53:46 +0200 |
commit | 8afc0676471b4802884ca7ee78d0097f1e5b5646 (patch) | |
tree | 0e62d61de96e80883ba06ccec7cda9f8edca5e1c /src/gui/painting/qtextureglyphcache.cpp | |
parent | b22d290a37903f2c5ecfe58e8183cd293ead99dc (diff) |
QtGui: Remove Q_WS and qpa.
Enable compilation without -qpa.
Remove QT_NO_FREETYPE and QT_NO_FONTCONFIG when building.
Change-Id: I0e017cc47ee06b885be65deaeb67a449a119b8be
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/painting/qtextureglyphcache.cpp')
-rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index b56f6b42e4..5876f3bf93 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -42,10 +42,9 @@ #include <qmath.h> #include "qtextureglyphcache_p.h" - +#include "private/qfontengine_p.h" #include "private/qnumeric_p.h" #include "private/qnativeimage_p.h" -#include "private/qfontengine_ft_p.h" QT_BEGIN_NAMESPACE |