diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 16:05:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 16:05:56 (GMT) |
| commit | ca83e2df556e4e3db361ffd09696ef6c94d7324e (patch) | |
| tree | 237edade3dc9e5fcdf623f9e7882805f0ea86c14 /src/plugins | |
| parent | 8ddf96a15f707001755d5b934f3f900b825b5887 (diff) | |
| parent | 57530dab8043c67b1356fb764fc83f6ef00dfdc1 (diff) | |
| download | Qt-ca83e2df556e4e3db361ffd09696ef6c94d7324e.zip Qt-ca83e2df556e4e3db361ffd09696ef6c94d7324e.tar.gz Qt-ca83e2df556e4e3db361ffd09696ef6c94d7324e.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/graphicssystems/meego/qmeegographicssystem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp index a70d232..6b8d2b3 100644 --- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp +++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp @@ -171,7 +171,7 @@ QPixmapData *QMeeGoGraphicsSystem::pixmapDataFromEGLSharedImage(Qt::HANDLE handl return QMeeGoGraphicsSystem::wrapPixmapData(pmd); } else { QRasterPixmapData *pmd = new QRasterPixmapData(QPixmapData::PixmapType); - pmd->fromImage(softImage, Qt::NoOpaqueDetection); + pmd->fromImage(softImage, Qt::NoFormatConversion); // Make sure that the image was not converted in any way if (pmd->buffer()->data_ptr()->data != |