diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-08 19:55:53 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-08 19:55:53 (GMT) |
| commit | f1a6ef2898322b44be739be43d45d17ebbf90919 (patch) | |
| tree | 5e84dd02f0260309c101e07e9be10bd8ad361f4d /src/gui/kernel | |
| parent | 1866cb339a53893792e4c3b894510feb7744324f (diff) | |
| parent | 1f46c72e313f1e223e7abb81dea48f4f5f68ebf7 (diff) | |
| download | Qt-f1a6ef2898322b44be739be43d45d17ebbf90919.zip Qt-f1a6ef2898322b44be739be43d45d17ebbf90919.tar.gz Qt-f1a6ef2898322b44be739be43d45d17ebbf90919.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
src/src.pro
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 { |