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/image | |
| 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/image')
| -rw-r--r-- | src/gui/image/qimage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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, |