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

Conflicts:
	configure
5.7 now supports clang on android; but dev re-worked configure

	src/gui/kernel/qevent.h
One side renamed a parameter of a constructor; the other added an
alternate constructor on the next line.  Applied the rename to both
for consistency.

	tests/auto/tools/moc/tst_moc.cpp
Each side added a new test at the end.

	.qmake.conf
Ignored 5.7's change to MODULE_VERSION.

	configure.json
No conflict noticed by git; but changes in 5.7 were needed for the
re-worked configure to accommodate 5.7's stricter handling of C++11.

Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index 5b8cc7893a..90aa3fef16 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -302,7 +302,12 @@ QPlatformWindow *QWindowsIntegration::createPlatformWindow(QWindow *window) cons
     }
 
     if (window->type() == Qt::ForeignWindow) {
-        QWindowsForeignWindow *result = new QWindowsForeignWindow(window, reinterpret_cast<HWND>(window->winId()));
+        const HWND hwnd = reinterpret_cast<HWND>(window->winId());
+        if (!IsWindow(hwnd)) {
+           qWarning("Windows QPA: Invalid foreign window ID %p.");
+           return nullptr;
+        }
+        QWindowsForeignWindow *result = new QWindowsForeignWindow(window, hwnd);
         const QRect obtainedGeometry = result->geometry();
         QScreen *screen = Q_NULLPTR;
         if (const QPlatformScreen *pScreen = result->screenForGeometry(obtainedGeometry))