diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/plugins/platforms/windows/qwindowsbackingstore.cpp | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsbackingstore.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsbackingstore.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.cpp b/src/plugins/platforms/windows/qwindowsbackingstore.cpp index 03b44458ac..68807fabdd 100644 --- a/src/plugins/platforms/windows/qwindowsbackingstore.cpp +++ b/src/plugins/platforms/windows/qwindowsbackingstore.cpp @@ -102,7 +102,8 @@ void QWindowsBackingStore::flush(QWindow *window, const QRegion ®ion, BLENDFUNCTION blend = {AC_SRC_OVER, 0, BYTE(qRound(255.0 * rw->opacity())), AC_SRC_ALPHA}; RECT dirty = {dirtyRect.x(), dirtyRect.y(), dirtyRect.x() + dirtyRect.width(), dirtyRect.y() + dirtyRect.height()}; - UPDATELAYEREDWINDOWINFO info = {sizeof(info), NULL, &ptDst, &size, m_image->hdc(), &ptSrc, 0, &blend, ULW_ALPHA, &dirty}; + UPDATELAYEREDWINDOWINFO info = {sizeof(info), nullptr, &ptDst, &size, + m_image->hdc(), &ptSrc, 0, &blend, ULW_ALPHA, &dirty}; const BOOL result = UpdateLayeredWindowIndirect(rw->handle(), &info); if (!result) qErrnoWarning("UpdateLayeredWindowIndirect failed for ptDst=(%d, %d)," @@ -207,7 +208,7 @@ HDC QWindowsBackingStore::getDC() const { if (!m_image.isNull()) return m_image->hdc(); - return 0; + return nullptr; } QImage QWindowsBackingStore::toImage() const |