diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-27 12:27:37 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2009-04-27 12:27:37 (GMT) |
| commit | fa6b4a76291229f29b21063f1ee8d550aec8c48b (patch) | |
| tree | 53827b4eaeb564d7de37bdcb845c05af30d35f5f /src/gui/embedded/qscreentransformed_qws.cpp | |
| parent | 96a27e24eec9356e45f1a6b6ff641a9afab24a39 (diff) | |
| parent | 63a4d6652aa8d84282083e49217120c97bb0bfc8 (diff) | |
| download | Qt-fa6b4a76291229f29b21063f1ee8d550aec8c48b.zip Qt-fa6b4a76291229f29b21063f1ee8d550aec8c48b.tar.gz Qt-fa6b4a76291229f29b21063f1ee8d550aec8c48b.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/embedded/qscreentransformed_qws.cpp')
| -rw-r--r-- | src/gui/embedded/qscreentransformed_qws.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/embedded/qscreentransformed_qws.cpp b/src/gui/embedded/qscreentransformed_qws.cpp index f988789..46ac1d1 100644 --- a/src/gui/embedded/qscreentransformed_qws.cpp +++ b/src/gui/embedded/qscreentransformed_qws.cpp @@ -410,7 +410,9 @@ void QTransformedScreen::blit(const QImage &image, const QPoint &topLeft, #endif #ifdef QT_QWS_DEPTH_8 case 8: - if (image.depth() == 16) + if (image.format() == QImage::Format_RGB444) + SET_BLIT_FUNC(quint8, qrgb444, trans, func); + else if (image.depth() == 16) SET_BLIT_FUNC(quint8, quint16, trans, func); else SET_BLIT_FUNC(quint8, quint32, trans, func); |