diff options
author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-21 22:00:10 (GMT) |
---|---|---|
committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-21 22:00:10 (GMT) |
commit | 215f46d0a61a2f48d1ccbbc52c3b161fa36c84ec (patch) | |
tree | 77e8cfce5c765702e5f60daf123d2740c1879d1c /src/plugins | |
parent | dd97db856bc19d648d7faa3aac4e27576dcb2512 (diff) | |
parent | be6a0b58680213da42d956ed9d1c77103be24c93 (diff) | |
download | Qt-215f46d0a61a2f48d1ccbbc52c3b161fa36c84ec.zip Qt-215f46d0a61a2f48d1ccbbc52c3b161fa36c84ec.tar.gz Qt-215f46d0a61a2f48d1ccbbc52c3b161fa36c84ec.tar.bz2 |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/plugins')
-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; } |