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

Conflicts:
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp

Change-Id: Ib6955eb874b516b185b45d6c38cec646fbaa95f4

1 files changed, 14 insertions, 12 deletions

diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index 63be3de3ab..6528c24c1a 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -555,6 +555,11 @@ void tst_QDialog::reject()
     QCOMPARE(dialog.called, 4);
 }
 
+static QByteArray formatPoint(QPoint p)
+{
+    return QByteArray::number(p.x()) + ", " + QByteArray::number(p.y());
+}
+
 void tst_QDialog::snapToDefaultButton()
 {
 #ifdef QT_NO_CURSOR
@@ -563,9 +568,9 @@ void tst_QDialog::snapToDefaultButton()
     if (!QGuiApplication::platformName().compare(QLatin1String("wayland"), Qt::CaseInsensitive))
         QSKIP("Wayland: Wayland does not support setting the cursor position.");
 
-    QPoint topLeftPos = QApplication::desktop()->availableGeometry().topLeft();
-    topLeftPos = QPoint(topLeftPos.x() + 100, topLeftPos.y() + 100);
-    QPoint startingPos(topLeftPos.x() + 250, topLeftPos.y() + 250);
+    const QRect dialogGeometry(QApplication::desktop()->availableGeometry().topLeft()
+                               + QPoint(100, 100), QSize(200, 200));
+    const QPoint startingPos = dialogGeometry.bottomRight() + QPoint(100, 100);
     QCursor::setPos(startingPos);
 #ifdef Q_OS_OSX
     // On OS X we use CGEventPost to move the cursor, it needs at least
@@ -576,17 +581,14 @@ void tst_QDialog::snapToDefaultButton()
     QDialog dialog;
     QPushButton *button = new QPushButton(&dialog);
     button->setDefault(true);
-    dialog.setGeometry(QRect(topLeftPos, QSize(200, 200)));
+    dialog.setGeometry(dialogGeometry);
     dialog.show();
     QVERIFY(QTest::qWaitForWindowExposed(&dialog));
-    if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) {
-        if (theme->themeHint(QPlatformTheme::DialogSnapToDefaultButton).toBool()) {
-            QPoint localPos = button->mapFromGlobal(QCursor::pos());
-            QVERIFY(button->rect().contains(localPos));
-        } else {
-            QCOMPARE(startingPos, QCursor::pos());
-        }
-    }
+    const QPoint localPos = button->mapFromGlobal(QCursor::pos());
+    if (QGuiApplicationPrivate::platformTheme()->themeHint(QPlatformTheme::DialogSnapToDefaultButton).toBool())
+        QVERIFY2(button->rect().contains(localPos), formatPoint(localPos).constData());
+    else
+        QVERIFY2(!button->rect().contains(localPos), formatPoint(localPos).constData());
 #endif // !QT_NO_CURSOR
 }