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/text/qfontdatabase.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/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 740cd4c52c..52cfb8a54e 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -556,9 +556,7 @@ public: HANDLE handle; bool memoryFont; QVector<FONTSIGNATURE> signatures; -#elif defined(Q_WS_MAC) - ATSFontContainerRef handle; -#elif defined(Q_OS_SYMBIAN) && defined(QT_NO_FREETYPE) +#elif defined(Q_OS_SYMBIAN) QString temporaryFileName; TInt screenDeviceFontFileId; TUid fontStoreFontFileUid; |