diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 12:30:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-04 12:30:14 (GMT) |
| commit | 57530dab8043c67b1356fb764fc83f6ef00dfdc1 (patch) | |
| tree | 7f64e6484b412b7b8bfae5cd3fa574e381aec652 /src/plugins | |
| parent | fe6748f91f94746f2f81b448df7c094b306c865d (diff) | |
| parent | 7b4e032559c7b226280e5c9229cd685e73d1e707 (diff) | |
| download | Qt-57530dab8043c67b1356fb764fc83f6ef00dfdc1.zip Qt-57530dab8043c67b1356fb764fc83f6ef00dfdc1.tar.gz Qt-57530dab8043c67b1356fb764fc83f6ef00dfdc1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Added image conversion flag to prevent conversions.
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 != |