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 | |
| 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')
| -rw-r--r-- | src/gui/painting/qmemrotate_p.h | 16 | ||||
| -rw-r--r-- | src/gui/painting/qpaintengine.h | 3 | ||||
| -rw-r--r-- | src/gui/painting/qpaintengine_raster_p.h | 2 | ||||
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 3 |
4 files changed, 6 insertions, 18 deletions
diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h index 84b0b01846..a8c2c6bfbd 100644 --- a/src/gui/painting/qmemrotate_p.h +++ b/src/gui/painting/qmemrotate_p.h @@ -70,20 +70,14 @@ QT_BEGIN_NAMESPACE #endif #endif -#if defined(Q_WS_QWS) || defined(Q_WS_QPA) && defined(Q_OS_WIN) -#define Q_GUI_QWS_EXPORT Q_GUI_EXPORT -#else -#define Q_GUI_QWS_EXPORT -#endif - #define QT_DECL_MEMROTATE(srctype, desttype) \ - void Q_GUI_QWS_EXPORT qt_memrotate90(const srctype*, int, int, int, desttype*, int); \ - void Q_GUI_QWS_EXPORT qt_memrotate180(const srctype*, int, int, int, desttype*, int); \ - void Q_GUI_QWS_EXPORT qt_memrotate270(const srctype*, int, int, int, desttype*, int) + void Q_GUI_EXPORT qt_memrotate90(const srctype*, int, int, int, desttype*, int); \ + void Q_GUI_EXPORT qt_memrotate180(const srctype*, int, int, int, desttype*, int); \ + void Q_GUI_EXPORT qt_memrotate270(const srctype*, int, int, int, desttype*, int) void Q_GUI_EXPORT qt_memrotate90(const quint32*, int, int, int, quint32*, int); -void Q_GUI_QWS_EXPORT qt_memrotate180(const quint32*, int, int, int, quint32*, int); -void Q_GUI_QWS_EXPORT qt_memrotate270(const quint32*, int, int, int, quint32*, int); +void Q_GUI_EXPORT qt_memrotate180(const quint32*, int, int, int, quint32*, int); +void Q_GUI_EXPORT qt_memrotate270(const quint32*, int, int, int, quint32*, int); QT_DECL_MEMROTATE(quint32, quint16); QT_DECL_MEMROTATE(quint16, quint32); diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h index 28c2942930..5d5424dfae 100644 --- a/src/gui/painting/qpaintengine.h +++ b/src/gui/painting/qpaintengine.h @@ -250,9 +250,6 @@ private: friend class QFontEngineBox; friend class QFontEngineMac; friend class QFontEngineWin; -#ifndef QT_NO_FREETYPE - friend class QFontEngineFT; -#endif #ifndef QT_NO_QWS_QPF friend class QFontEngineQPF1; #endif diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 6e71e9986a..d9cc428337 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -324,8 +324,6 @@ public: #if defined (Q_OS_WIN) HDC hdc; -#elif defined(Q_WS_MAC) - CGContextRef cgContext; #endif QRect deviceRect; 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 |