Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/plugins/platforms/windows/qwindowsfontengine.cpp
	src/plugins/platforms/windows/qwindowsnativeimage.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I649b32b260ce0ed2d6a5089021daa0d6a8db85f7

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/platforms/windows/qwindowsnativeimage.cpp b/src/plugins/platforms/windows/qwindowsnativeimage.cpp
index 72e3268405..bc8bfda32b 100644
--- a/src/plugins/platforms/windows/qwindowsnativeimage.cpp
+++ b/src/plugins/platforms/windows/qwindowsnativeimage.cpp
@@ -99,13 +99,13 @@ static inline HBITMAP createDIB(HDC hdc, int width, int height,
         bmi.blueMask = 0;
     }
 
-    void *bits = 0;
+    uchar *bits = Q_NULLPTR;
     HBITMAP bitmap = CreateDIBSection(hdc, reinterpret_cast<BITMAPINFO *>(&bmi),
-                                      DIB_RGB_COLORS, &bits, 0, 0);
+                                      DIB_RGB_COLORS, reinterpret_cast<void **>(&bits), 0, 0);
     if (Q_UNLIKELY(!bitmap || !bits))
         qFatal("%s: CreateDIBSection failed.", __FUNCTION__);
 
-    *bitsIn = (uchar*)bits;
+    *bitsIn = bits;
     return bitmap;
 }
 
@@ -118,7 +118,7 @@ QWindowsNativeImage::QWindowsNativeImage(int width, int height,
     if (width != 0 && height != 0) {
         uchar *bits;
         m_bitmap = createDIB(m_hdc, width, height, format, &bits);
-        m_null_bitmap = (HBITMAP)SelectObject(m_hdc, m_bitmap);
+        m_null_bitmap = static_cast<HBITMAP>(SelectObject(m_hdc, m_bitmap));
         m_image = QImage(bits, width, height, format);
         Q_ASSERT(m_image.paintEngine()->type() == QPaintEngine::Raster);
         static_cast<QRasterPaintEngine *>(m_image.paintEngine())->setDC(m_hdc);