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

Conflicts:
	examples/examples.pro
	qmake/library/qmakebuiltins.cpp
	src/corelib/global/qglobal.cpp
		Re-apply b525ec2 to qrandom.cpp(code movement in 030782e)
	src/corelib/global/qnamespace.qdoc
	src/corelib/global/qrandom.cpp
	src/gui/kernel/qwindow.cpp
		Re-apply a3d59c7 to QWindowPrivate::setVisible() (code movement in d7a9e08)
	src/network/ssl/qsslkey_openssl.cpp
	src/plugins/platforms/android/androidjniinput.cpp
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/widgets/widgets/qmenu.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp

Change-Id: If7ab427804408877a93cbe02079fca58e568bfd3

3 files changed, 31 insertions, 13 deletions

diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index 5e3cb66aae..1be17b552e 100644
--- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -41,7 +41,6 @@
 #include <qcommonstyle.h>
 #include <qstylefactory.h>
 #include <qscreen.h>
-#include <QSysInfo>
 
 typedef QList<QGraphicsItem *> QGraphicsItemList;
 
@@ -1777,16 +1776,10 @@ void tst_QGraphicsWidget::updateFocusChainWhenChildDie()
 #ifdef Q_OS_MAC
     QEXPECT_FAIL("", "QTBUG-23699", Continue);
 #endif
-#ifdef Q_OS_WIN
-    if (QSysInfo::kernelVersion() == "10.0.15063") {
-        QEXPECT_FAIL("", "This fails on Windows 10 Creators Update (10.0.15063)", Continue);
-    }
-#endif
     QTRY_COMPARE(qApp->activeWindow(), static_cast<QWidget *>(&view));
     QTRY_COMPARE(scene.focusItem(), static_cast<QGraphicsItem *>(w));
 }
 
-
 void tst_QGraphicsWidget::sizeHint_data()
 {
     QTest::addColumn<bool>("layout");
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index d328163a05..096beedf63 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -1774,12 +1774,6 @@ void tst_QWidget::activation()
     QCOMPARE(QApplication::activeWindow(), &widget2);
     widget2.hide();
     QTest::qWait(waitTime);
-#ifdef Q_OS_WIN
-    if (QSysInfo::kernelVersion() == "10.0.15063") {
-        QEXPECT_FAIL("", "This fails on Windows 10 Creators Update (10.0.15063)", Continue);
-        // This happens in automated Windows 10 Creators Update (10.0.15063) CI builds!
-    }
-#endif
     QCOMPARE(QApplication::activeWindow(), &widget1);
 }
 #endif // Q_OS_WIN
diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index a6855a417e..9dc513c115 100644
--- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
@@ -104,6 +104,8 @@ private slots:
     void setWindowState();
 
     void nativeShow();
+
+    void QTBUG_56277_resize_on_showEvent();
 };
 
 void tst_QWidget_window::initTestCase()
@@ -931,5 +933,34 @@ void tst_QWidget_window::nativeShow()
     QTRY_VERIFY(!w.isVisible());
 }
 
+class ResizedOnShowEventWidget : public QWidget
+{
+public:
+    void showEvent(QShowEvent *) override
+    {
+        const auto *primaryScreen = QApplication::primaryScreen();
+        auto newSize = primaryScreen->availableGeometry().size() / 4;
+        if (newSize == geometry().size())
+            newSize -= QSize(10, 10);
+        resize(newSize);
+    }
+};
+
+void tst_QWidget_window::QTBUG_56277_resize_on_showEvent()
+{
+    const auto platformName = QGuiApplication::platformName().toLower();
+    if (platformName != "cocoa" && platformName != "windows")
+        QSKIP("This can only be consistently tested on desktop platforms with well-known behavior.");
+
+    ResizedOnShowEventWidget w;
+    w.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&w));
+    const auto *screen = w.windowHandle()->screen();
+    const auto geometry = w.geometry();
+    const int frameHeight = geometry.top() - w.frameGeometry().top();
+    const int topmostY = screen->availableGeometry().top() + frameHeight;
+    QVERIFY(geometry.top() > topmostY || geometry.left() > screen->availableGeometry().left());
+}
+
 QTEST_MAIN(tst_QWidget_window)
 #include "tst_qwidget_window.moc"