diff options
| author | Michael Dominic K <mdk@codethink.co.uk> | 2010-10-28 09:35:54 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-10-28 09:36:59 (GMT) |
| commit | 28bd0c6568aefa552c5e37a4e2ef98969c68d0b4 (patch) | |
| tree | 2e01d2330e1cf03592b59e674490520f5def590b | |
| parent | 8c183dc88d4ba0c14e29433294a6885f29ffc36c (diff) | |
| download | Qt-28bd0c6568aefa552c5e37a4e2ef98969c68d0b4.zip Qt-28bd0c6568aefa552c5e37a4e2ef98969c68d0b4.tar.gz Qt-28bd0c6568aefa552c5e37a4e2ef98969c68d0b4.tar.bz2 | |
Do not support QImage::Format_ARGB32 in meego gfx for egl images.
It was a bug/mistake to support that.
Merge-request: 2499
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp index 96fbd6c..a633e2f 100644 --- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp +++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp @@ -151,9 +151,8 @@ void QMeeGoGraphicsSystem::setTranslucent(bool translucent) QPixmapData *QMeeGoGraphicsSystem::pixmapDataFromEGLSharedImage(Qt::HANDLE handle, const QImage &softImage) { if (softImage.format() != QImage::Format_ARGB32_Premultiplied && - softImage.format() != QImage::Format_ARGB32 && softImage.format() != QImage::Format_RGB32) { - qFatal("For egl shared images, the soft image has to be ARGB32, ARGB32_Premultiplied or RGB32"); + qFatal("For egl shared images, the soft image has to be ARGB32_Premultiplied or RGB32"); return NULL; } |