diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 15:29:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 15:29:37 (GMT) |
| commit | d241b5a663b9b9ad457ae3b2510b36b72a7bc316 (patch) | |
| tree | 6cf7a29fa08dc8c42b83a4b90ca3d2cb464c05e8 /src/gui/kernel | |
| parent | 86354a3896b92b110e5d28cbf894c23ed837f11e (diff) | |
| parent | b4519f022e8b715991836894fe97b6338ef7ee2b (diff) | |
| download | Qt-d241b5a663b9b9ad457ae3b2510b36b72a7bc316.zip Qt-d241b5a663b9b9ad457ae3b2510b36b72a7bc316.tar.gz Qt-d241b5a663b9b9ad457ae3b2510b36b72a7bc316.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:
fix to mainwindow demo
Fix build on Maemo X11
Fix crash on Win with 16bit screendepth when copy/pasting images
Enable cleanup hooks when creating an EGL surface for a pixmap
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qmime_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qmime_win.cpp b/src/gui/kernel/qmime_win.cpp index 39633bf..2840843 100644 --- a/src/gui/kernel/qmime_win.cpp +++ b/src/gui/kernel/qmime_win.cpp @@ -952,6 +952,8 @@ bool QWindowsMimeImage::convertFromMime(const FORMATETC &formatetc, const QMimeD QDataStream s(&ba, QIODevice::WriteOnly); s.setByteOrder(QDataStream::LittleEndian);// Intel byte order #### if (cf == CF_DIB) { + if (img.format() > QImage::Format_ARGB32) + img = img.convertToFormat(QImage::Format_RGB32); if (qt_write_dib(s, img)) return setData(ba, pmedium); } else { |