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

Conflicts:
	examples/network/network.pro
	mkspecs/features/mac/default_post.prf
	src/corelib/io/qfilesystemengine_win.cpp
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess.h
	src/corelib/io/qprocess_p.h
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/thread/qmutex.cpp
	src/platformsupport/fontdatabases/windows/windows.pri
	src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
	tests/auto/corelib/io/io.pro

Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e

2 files changed, 81 insertions, 0 deletions

diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index a35ea8eb6e..f127fd98f7 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -97,6 +97,8 @@ private slots:
     void testDefaultButton();
 
     void task191642_default();
+    void testDeletedStandardButton();
+
 private:
     qint64 timeStamp;
     qint64 buttonClicked1TimeStamp;
@@ -843,5 +845,22 @@ void tst_QDialogButtonBox::task191642_default()
     QCOMPARE(clicked.count(), 1);
 }
 
+void tst_QDialogButtonBox::testDeletedStandardButton()
+{
+    QDialogButtonBox buttonBox;
+    delete buttonBox.addButton(QDialogButtonBox::Ok);
+    QPointer<QPushButton> buttonC = buttonBox.addButton(QDialogButtonBox::Cancel);
+    delete buttonBox.addButton(QDialogButtonBox::Cancel);
+    QPointer<QPushButton> buttonA = buttonBox.addButton(QDialogButtonBox::Apply);
+    delete buttonBox.addButton(QDialogButtonBox::Help);
+    // A few button have been deleted, they should automatically be removed
+    QCOMPARE(buttonBox.standardButtons(), QDialogButtonBox::Apply | QDialogButtonBox::Cancel);
+
+    buttonBox.setStandardButtons(QDialogButtonBox::Reset | QDialogButtonBox::Cancel);
+    // setStanderdButton should delete previous buttons
+    QVERIFY(!buttonA);
+    QVERIFY(!buttonC);
+}
+
 QTEST_MAIN(tst_QDialogButtonBox)
 #include "tst_qdialogbuttonbox.moc"
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 3218b8ac68..b037cc2141 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -42,6 +42,7 @@
 
 #include <qmenu.h>
 #include <qstyle.h>
+#include <QStyleHints>
 #include <QTimer>
 #include <qdebug.h>
 
@@ -110,6 +111,9 @@ private slots:
     void QTBUG_37933_ampersands_data();
     void QTBUG_37933_ampersands();
 #endif
+    void QTBUG_56917_wideMenuSize();
+    void QTBUG_56917_wideMenuScreenNumber();
+    void QTBUG_56917_wideSubmenuScreenNumber();
 protected slots:
     void onActivated(QAction*);
     void onHighlighted(QAction*);
@@ -1311,5 +1315,63 @@ void tst_QMenu::QTBUG_37933_ampersands()
 }
 #endif
 
+void tst_QMenu::QTBUG_56917_wideMenuSize()
+{
+    // menu shouldn't to take on full screen height when menu width is larger than screen width
+    QMenu menu;
+    QString longString;
+    longString.fill(QLatin1Char('Q'), 3000);
+    menu.addAction(longString);
+    QSize menuSizeHint = menu.sizeHint();
+    menu.popup(QPoint());
+    QTest::qWait(100);
+    QVERIFY(QTest::qWaitForWindowExposed(&menu));
+    QVERIFY(menu.isVisible());
+    QVERIFY(menu.height() <= menuSizeHint.height());
+}
+
+void tst_QMenu::QTBUG_56917_wideMenuScreenNumber()
+{
+    if (QApplication::styleHints()->showIsFullScreen())
+        QSKIP("The platform defaults to windows being fullscreen.");
+    // menu must appear on the same screen where show action is triggered
+    QString longString;
+    longString.fill(QLatin1Char('Q'), 3000);
+
+    for (int i = 0; i < QApplication::desktop()->screenCount(); i++) {
+        QMenu menu;
+        menu.addAction(longString);
+        menu.popup(QApplication::desktop()->screen(i)->geometry().center());
+        QTest::qWait(100);
+        QVERIFY(QTest::qWaitForWindowExposed(&menu));
+        QVERIFY(menu.isVisible());
+        QCOMPARE(QApplication::desktop()->screenNumber(&menu), i);
+    }
+}
+
+void tst_QMenu::QTBUG_56917_wideSubmenuScreenNumber()
+{
+    if (QApplication::styleHints()->showIsFullScreen())
+        QSKIP("The platform defaults to windows being fullscreen.");
+    // submenu must appear on the same screen where its parent menu is shown
+    QString longString;
+    longString.fill(QLatin1Char('Q'), 3000);
+
+    for (int i = 0; i < QApplication::desktop()->screenCount(); i++) {
+        QMenu menu;
+        QMenu submenu("Submenu");
+        submenu.addAction(longString);
+        QAction *action = menu.addMenu(&submenu);
+        menu.popup(QApplication::desktop()->screen(i)->geometry().center());
+        QVERIFY(QTest::qWaitForWindowExposed(&menu));
+        QVERIFY(menu.isVisible());
+        QTest::mouseClick(&menu, Qt::LeftButton, 0, menu.actionGeometry(action).center());
+        QTest::qWait(100);
+        QVERIFY(QTest::qWaitForWindowExposed(&submenu));
+        QVERIFY(submenu.isVisible());
+        QCOMPARE(QApplication::desktop()->screenNumber(&submenu), i);
+    }
+}
+
 QTEST_MAIN(tst_QMenu)
 #include "tst_qmenu.moc"