diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-13 13:22:21 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-13 13:22:21 (GMT) |
| commit | f15352c51625688ec445c73125a2e25327377d49 (patch) | |
| tree | 0d7d82d8ea8ffeff5cf042cd70af3200ec6f1925 /src/gui/embedded | |
| parent | c8c5becc81679eb8a9a0f8baa454bc43fd3cccf9 (diff) | |
| parent | 0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9 (diff) | |
| download | Qt-f15352c51625688ec445c73125a2e25327377d49.zip Qt-f15352c51625688ec445c73125a2e25327377d49.tar.gz Qt-f15352c51625688ec445c73125a2e25327377d49.tar.bz2 | |
Merge commit 'qt/master'
Diffstat (limited to 'src/gui/embedded')
| -rw-r--r-- | src/gui/embedded/qscreentransformed_qws.cpp | 12 | ||||
| -rw-r--r-- | src/gui/embedded/qscreenvfb_qws.cpp | 3 | ||||
| -rw-r--r-- | src/gui/embedded/qwindowsystem_qws.cpp | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/gui/embedded/qscreentransformed_qws.cpp b/src/gui/embedded/qscreentransformed_qws.cpp index 46ac1d1..e22ea1f 100644 --- a/src/gui/embedded/qscreentransformed_qws.cpp +++ b/src/gui/embedded/qscreentransformed_qws.cpp @@ -400,7 +400,19 @@ void QTransformedScreen::blit(const QImage &image, const QPoint &topLeft, #endif #if defined(QT_QWS_DEPTH_16) || defined(QT_QWS_DEPTH_15) || defined(QT_QWS_DEPTH_12) case 16: +#if defined QT_QWS_ROTATE_BGR + if (pixelType() == BGRPixel && image.depth() == 16) { + SET_BLIT_FUNC(qbgr565, quint16, trans, func); + break; + } //fall-through here!!! +#endif case 15: +#if defined QT_QWS_ROTATE_BGR + if (pixelType() == BGRPixel && image.format() == QImage::Format_RGB555) { + SET_BLIT_FUNC(qbgr555, qrgb555, trans, func); + break; + } //fall-through here!!! +#endif case 12: if (image.depth() == 16) SET_BLIT_FUNC(quint16, quint16, trans, func); diff --git a/src/gui/embedded/qscreenvfb_qws.cpp b/src/gui/embedded/qscreenvfb_qws.cpp index abbe73b..accfe1f 100644 --- a/src/gui/embedded/qscreenvfb_qws.cpp +++ b/src/gui/embedded/qscreenvfb_qws.cpp @@ -310,6 +310,9 @@ bool QVFbScreen::connect(const QString &displaySpec) connected = this; + if (qgetenv("QT_QVFB_BGR").toInt()) + pixeltype = BGRPixel; + return true; } diff --git a/src/gui/embedded/qwindowsystem_qws.cpp b/src/gui/embedded/qwindowsystem_qws.cpp index dffebf2..fdcd193 100644 --- a/src/gui/embedded/qwindowsystem_qws.cpp +++ b/src/gui/embedded/qwindowsystem_qws.cpp @@ -4044,7 +4044,7 @@ void QWSServer::setDesktopBackground(const QImage &img) */ void QWSServer::setDesktopBackground(const QColor &c) { - setDesktopBackground(QBrush(c)); + setBackground(QBrush(c)); } #endif //QT3_SUPPORT |