1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsbackingstore.cpp b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
index bbb6b5305f..fad7dbdbf4 100644
--- a/src/plugins/platforms/windows/qwindowsbackingstore.cpp
+++ b/src/plugins/platforms/windows/qwindowsbackingstore.cpp
@@ -78,11 +78,12 @@ QPaintDevice *QWindowsBackingStore::paintDevice()
 void QWindowsBackingStore::flush(QWindow *window, const QRegion &region,
                                         const QPoint &offset)
 {
+    Q_ASSERT(window);
     // TODO: Prepare paint for translucent windows.
     const QRect br = region.boundingRect();
     if (QWindowsContext::verboseBackingStore > 1)
         qDebug() << __FUNCTION__ << window << offset << br;
-    QWindowsWindow *rw = rasterWindow();
+    QWindowsWindow *rw = QWindowsWindow::baseWindowOf(window);
     const HDC dc = rw->getDC();
     if (!dc) {
         qErrnoWarning("%s: GetDC failed", __FUNCTION__);
@@ -106,6 +107,7 @@ void QWindowsBackingStore::flush(QWindow *window, const QRegion &region,
 void QWindowsBackingStore::resize(const QSize &size, const QRegion &region)
 {
     if (m_image.isNull() || m_image->image().size() != size) {
+#ifndef QT_NO_DEBUG_OUTPUT
         if (QWindowsContext::verboseBackingStore) {
             QDebug nsp = qDebug().nospace();
             nsp << __FUNCTION__ << ' ' << rasterWindow()->window()
@@ -113,6 +115,7 @@ void QWindowsBackingStore::resize(const QSize &size, const QRegion &region)
             if (!m_image.isNull())
                 nsp << " from: " << m_image->image().size();
         }
+#endif
         m_image.reset(new QWindowsNativeImage(size.width(), size.height(),
                                               QWindowsNativeImage::systemFormat()));
     }