From 8afc0676471b4802884ca7ee78d0097f1e5b5646 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 20 Oct 2011 13:35:27 +0200 Subject: QtGui: Remove Q_WS and qpa. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Enable compilation without -qpa. Remove QT_NO_FREETYPE and QT_NO_FONTCONFIG when building. Change-Id: I0e017cc47ee06b885be65deaeb67a449a119b8be Reviewed-by: Eskil Abrahamsen Blomfeldt Reviewed-by: Samuel Rødal --- src/gui/painting/qmemrotate_p.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/gui/painting/qmemrotate_p.h') 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); -- cgit v1.2.3