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, 2 insertions, 2 deletions

diff --git a/src/plugins/platforms/windows/qwindowsclipboard.cpp b/src/plugins/platforms/windows/qwindowsclipboard.cpp
index 95e595b88e..d527e07308 100644
--- a/src/plugins/platforms/windows/qwindowsclipboard.cpp
+++ b/src/plugins/platforms/windows/qwindowsclipboard.cpp
@@ -265,9 +265,9 @@ bool QWindowsClipboard::clipboardViewerWndProc(HWND hwnd, UINT message, WPARAM w
 
     switch (message) {
     case WM_CHANGECBCHAIN: {
-        const HWND toBeRemoved = (HWND)wParam;
+        const HWND toBeRemoved = reinterpret_cast<HWND>(wParam);
         if (toBeRemoved == m_nextClipboardViewer) {
-            m_nextClipboardViewer = (HWND)lParam;
+            m_nextClipboardViewer = reinterpret_cast<HWND>(lParam);
         } else {
             propagateClipboardMessage(message, wParam, lParam);
         }