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/image/qimage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gui/image/qimage.cpp') diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index 2a6b22c2d1..c74b715f8d 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -2879,7 +2879,7 @@ CONVERT_DECL(quint32, qrgb666) CONVERT_DECL(qargb6666, quint32) CONVERT_DECL(quint32, qargb6666) CONVERT_DECL(qrgb555, quint32) -#if !defined(Q_WS_QWS) || (defined(QT_QWS_DEPTH_15) && defined(QT_QWS_DEPTH_16)) +#if (defined(QT_QWS_DEPTH_15) && defined(QT_QWS_DEPTH_16)) CONVERT_DECL(quint16, qrgb555) CONVERT_DECL(qrgb555, quint16) #endif @@ -3046,7 +3046,7 @@ static Image_Converter converter_map[QImage::NImageFormats][QImage::NImageFormat 0, 0, 0, -#if !defined(Q_WS_QWS) || (defined(QT_QWS_DEPTH_15) && defined(QT_QWS_DEPTH_16)) +#if defined(QT_QWS_DEPTH_15) && defined(QT_QWS_DEPTH_16) CONVERT_PTR(qrgb555, quint16), #else 0, @@ -3122,7 +3122,7 @@ static Image_Converter converter_map[QImage::NImageFormats][QImage::NImageFormat CONVERT_PTR(quint32, qrgb555), CONVERT_PTR(quint32, qrgb555), CONVERT_PTR(quint32, qrgb555), -#if !defined(Q_WS_QWS) || (defined(QT_QWS_DEPTH_15) && defined(QT_QWS_DEPTH_16)) +#if defined(QT_QWS_DEPTH_15) && defined(QT_QWS_DEPTH_16) CONVERT_PTR(quint16, qrgb555), #else 0, -- cgit v1.2.3