diff options
| author | Michael Dominic K <mdk@codethink.co.uk> | 2010-10-21 08:42:45 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-10-21 10:03:16 (GMT) |
| commit | 8749766b23518277af81561e81c0a644375548f2 (patch) | |
| tree | 470e06c779f1acd344eb1288158ea8940b744afc /src/plugins/graphicssystems/meego | |
| parent | defe418c16e5e79033812752416efa874c70e622 (diff) | |
| download | Qt-8749766b23518277af81561e81c0a644375548f2.zip Qt-8749766b23518277af81561e81c0a644375548f2.tar.gz Qt-8749766b23518277af81561e81c0a644375548f2.tar.bz2 | |
In meego, support Format_RGB32 too for eglShared images.
Merge-request: 2493
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/graphicssystems/meego')
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp index 27e728a..772db44 100644 --- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp +++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp @@ -150,8 +150,9 @@ 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) { - qFatal("For egl shared images, the soft image has to be ARGB32 or 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"); return NULL; } |