diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 14:27:45 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-13 16:08:01 +0200 |
| commit | ff334fd57414be90ab6b40f91e16f0bdb1835762 (patch) | |
| tree | bb74d8217781394163870cb3399f0984136498c8 /src/plugins/platforms/windows/qwindowsbackingstore.cpp | |
| parent | ec4c93a852ddc1d1437232241de492ad20d4cbb1 (diff) | |
| parent | b5552bab40f2e165cf7196993ffc83785f4d8264 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsbackingstore.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsbackingstore.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.cpp b/src/plugins/platforms/windows/qwindowsbackingstore.cpp index 1abf447709..34a9c1df5f 100644 --- a/src/plugins/platforms/windows/qwindowsbackingstore.cpp +++ b/src/plugins/platforms/windows/qwindowsbackingstore.cpp @@ -145,9 +145,8 @@ void QWindowsBackingStore::resize(const QSize &size, const QRegion ®ion) << " from: " << (m_image.isNull() ? QSize() : m_image->image().size()); } #endif - QImage::Format format = QWindowsNativeImage::systemFormat(); - if (format == QImage::Format_RGB32 && window()->format().hasAlpha()) - format = QImage::Format_ARGB32_Premultiplied; + const QImage::Format format = window()->format().hasAlpha() ? + QImage::Format_ARGB32_Premultiplied : QWindowsNativeImage::systemFormat(); QWindowsNativeImage *oldwni = m_image.data(); QWindowsNativeImage *newwni = new QWindowsNativeImage(size.width(), size.height(), format); |