Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I5d8d370a4da0a155914cd0e07610a1dcbd737f67

2 files changed, 3 insertions, 3 deletions

diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
index 513df4f31..12ac34a35 100644
--- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
@@ -100,7 +100,7 @@ void VideoWidget::paintEvent(QPaintEvent *event)
             QRegion region = event->region();
             region = region.subtracted(videoRect);
 
-            QBrush brush = palette().background();
+            QBrush brush = palette().window();
 
             for (const QRect &rect : region)
                 painter.fillRect(rect, brush);
@@ -108,7 +108,7 @@ void VideoWidget::paintEvent(QPaintEvent *event)
 
         surface->paint(&painter);
     } else {
-        painter.fillRect(event->rect(), palette().background());
+        painter.fillRect(event->rect(), palette().window());
     }
 }
 //! [3]
diff --git a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp
index 63307913b..6be039108 100644
--- a/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp
+++ b/tests/auto/unit/qvideoframe/tst_qvideoframe.cpp
@@ -733,7 +733,7 @@ void tst_QVideoFrame::mapImage()
     QVERIFY(frame.map(mode));
 
     QVERIFY(frame.bits());
-    QCOMPARE(frame.mappedBytes(), image.byteCount());
+    QCOMPARE(qsizetype(frame.mappedBytes()), image.sizeInBytes());
     QCOMPARE(frame.bytesPerLine(), image.bytesPerLine());
     QCOMPARE(frame.mapMode(), mode);