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

Conflicts:
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qfiledialog.cpp
	tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp

Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad

1 files changed, 3 insertions, 22 deletions

diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index b7e8cded7a..ab9729342c 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -1755,25 +1755,6 @@ void tst_QApplication::focusOut()
     QTest::qWait(2000);
 }
 
-class SpontaneousEvent
-{
-    Q_GADGET
-    QDOC_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
-    Q_ENUMS(Type)
-public:
-    enum Type {
-        Void
-    };
-
-    virtual ~SpontaneousEvent() {}
-
-    QEventPrivate *d;
-    ushort t;
-
-    ushort posted : 1;
-    ushort spont : 1;
-};
-
 void tst_QApplication::focusMouseClick()
 {
     int argc = 1;
@@ -1791,14 +1772,14 @@ void tst_QApplication::focusMouseClick()
     // now send a mouse button press event and check what happens with the focus
     // it should be given to the parent widget
     QMouseEvent ev(QEvent::MouseButtonPress, QPointF(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-    reinterpret_cast<SpontaneousEvent *>(&ev)->spont = 1;
+    QSpontaneKeyEvent::setSpontaneous(&ev);
     QVERIFY(ev.spontaneous());
     qApp->notify(&w2, &ev);
     QCOMPARE(QApplication::focusWidget(), &w);
 
     // then we give the inner widget strong focus -> it should get focus
     w2.setFocusPolicy(Qt::StrongFocus);
-    reinterpret_cast<SpontaneousEvent *>(&ev)->spont = 1;
+    QSpontaneKeyEvent::setSpontaneous(&ev);
     QVERIFY(ev.spontaneous());
     qApp->notify(&w2, &ev);
     QTRY_COMPARE(QApplication::focusWidget(), &w2);
@@ -1806,7 +1787,7 @@ void tst_QApplication::focusMouseClick()
     // now back to tab focus and click again (it already had focus) -> focus should stay
     // (focus was revoked as of QTBUG-34042)
     w2.setFocusPolicy(Qt::TabFocus);
-    reinterpret_cast<SpontaneousEvent *>(&ev)->spont = 1;
+    QSpontaneKeyEvent::setSpontaneous(&ev);
     QVERIFY(ev.spontaneous());
     qApp->notify(&w2, &ev);
     QCOMPARE(QApplication::focusWidget(), &w2);