diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
| commit | 1077edd108129a628195708c787c3922d2270c37 (patch) | |
| tree | 1346bb4e46562b6d6fba22c7e81efa30470044bb /src/gui/text/qrawfont_p.h | |
| parent | 0e3823d30c2294eb11c205ca11fca55508478151 (diff) | |
| parent | c41153e69336701488385d9194d72e72164b28b8 (diff) | |
Merge remote branch 'origin/master' into refactor
Diffstat (limited to 'src/gui/text/qrawfont_p.h')
| -rw-r--r-- | src/gui/text/qrawfont_p.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/text/qrawfont_p.h b/src/gui/text/qrawfont_p.h index f9a9ab55cd..6c84be2d97 100644 --- a/src/gui/text/qrawfont_p.h +++ b/src/gui/text/qrawfont_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE namespace { class CustomFontFileLoader; } -class Q_AUTOTEST_EXPORT QRawFontPrivate +class Q_GUI_EXPORT QRawFontPrivate { public: QRawFontPrivate() @@ -83,7 +83,6 @@ public: , fontHandle(NULL) , ptrAddFontMemResourceEx(other.ptrAddFontMemResourceEx) , ptrRemoveFontMemResourceEx(other.ptrRemoveFontMemResourceEx) - , uniqueFamilyName(other.uniqueFamilyName) #endif { fontEngine = other.fontEngine; @@ -102,7 +101,6 @@ public: void platformLoadFromData(const QByteArray &fontData, int pixelSize, QFont::HintingPreference hintingPreference); - void platformSetPixelSize(int pixelSize); static QRawFontPrivate *get(const QRawFont &font) { return font.d.data(); } @@ -120,8 +118,6 @@ public: PtrAddFontMemResourceEx ptrAddFontMemResourceEx; PtrRemoveFontMemResourceEx ptrRemoveFontMemResourceEx; - QString uniqueFamilyName; - #endif // Q_WS_WIN }; |