3 files changed, 60 insertions, 10 deletions
diff --git a/tests/auto/gui/kernel/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
index 6960f99af2..8e8169b16c 100644
--- a/tests/auto/gui/kernel/qevent/tst_qevent.cpp
+++ b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
@@ -6,7 +6,52 @@
 
 #include <QtGui/qguiapplication.h>
 #include <QtGui/qevent.h>
+#if QT_CONFIG(future)
 #include <QtCore/private/qfutureinterface_p.h>
+#endif
+
+
+#if QT_CONFIG(future)
+#define X_QFutureCallOutEvent(X) X(QFutureCallOutEvent, ())
+#else
+#define X_QFutureCallOutEvent(X)
+#endif
+
+#if QT_CONFIG(wheelevent)
+#define X_QWheelEvent(X) X(QWheelEvent, ({}, {}, {}, {}, {}, {}, {}, {}))
+#else
+#define X_QWheelEvent(X)
+#endif
+
+#if QT_CONFIG(tabletevent)
+#define X_QTabletEvent(X) X(QTabletEvent, (QEvent::None, QPointingDevice::primaryPointingDevice(), {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}))
+#else
+#define X_QTabletEvent(X)
+#endif
+
+#if QT_CONFIG(gestures)
+#define X_QNativeGestureEvent(X) X(QNativeGestureEvent, ({}, QPointingDevice::primaryPointingDevice(), 0, {}, {}, {}, {}, {}))
+#else
+#define X_QNativeGestureEvent(X)
+#endif
+
+#if QT_CONFIG(whatsthis)
+#define X_QWhatsThisClickedEvent(X) X(QWhatsThisClickedEvent, ({}))
+#else
+#define X_QWhatsThisClickedEvent(X)
+#endif
+
+#if QT_CONFIG(action)
+#define X_QActionEvent(X) X(QActionEvent, (0, nullptr))
+#else
+#define X_QActionEvent(X)
+#endif
+
+#if QT_CONFIG(shortcut)
+#define X_QShortcutEvent(X) X(QShortcutEvent, ({}, 0))
+#else
+#define X_QShortcutEvent(X)
+#endif
 
 #define FOR_EACH_CORE_EVENT(X) \
     /* qcoreevent.h */ \
@@ -15,7 +60,7 @@
     X(QChildEvent, (QEvent::ChildAdded, nullptr)) \
     X(QDynamicPropertyChangeEvent, ("size")) \
     /* qfutureinterface_p.h */ \
-    X(QFutureCallOutEvent, ()) \
+    X_QFutureCallOutEvent(X) \
     /* end */
 
 #define FOR_EACH_GUI_EVENT(X) \
@@ -27,9 +72,9 @@
     X(QEnterEvent, ({}, {}, {})) \
     X(QMouseEvent, (QEvent::None, {}, {}, {}, {}, {}, {}, {}, QPointingDevice::primaryPointingDevice())) \
     X(QHoverEvent, (QEvent::None, {}, {}, QPointF{})) \
-    X(QWheelEvent, ({}, {}, {}, {}, {}, {}, {}, {})) \
-    X(QTabletEvent, (QEvent::None, QPointingDevice::primaryPointingDevice(), {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {})) \
-    X(QNativeGestureEvent, ({}, QPointingDevice::primaryPointingDevice(), 0, {}, {}, {}, {}, {})) \
+    X_QWheelEvent(X) \
+    X_QTabletEvent(X) \
+    X_QNativeGestureEvent(X) \
     X(QKeyEvent, (QEvent::None, 0, {})) \
     X(QFocusEvent, (QEvent::None)) \
     X(QPaintEvent, (QRect{0, 0, 100, 100})) \
@@ -50,11 +95,11 @@
     X(QDragLeaveEvent, ()) \
     X(QHelpEvent, ({}, {}, {})) \
     X(QStatusTipEvent, ({})) \
-    X(QWhatsThisClickedEvent, ({})) \
-    X(QActionEvent, (0, nullptr)) \
+    X_QWhatsThisClickedEvent(X) \
+    X_QActionEvent(X) \
     X(QFileOpenEvent, (QString{})) \
     X(QToolBarChangeEvent, (false)) \
-    X(QShortcutEvent, ({}, 0)) \
+    X_QShortcutEvent(X) \
     X(QWindowStateChangeEvent, ({})) \
     X(QTouchEvent, (QEvent::None)) \
     X(QScrollPrepareEvent, ({})) \
diff --git a/tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp
index 526abd6ea3..fdb1b333ef 100644
--- a/tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_foreignwindow.cpp
@@ -172,6 +172,9 @@ void tst_ForeignWindow::destroyWhenParentIsDestroyed()
     // Reparenting into a window will result in creating it
     QVERIFY(parentWindow.handle());
 
+    parentWindow.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&parentWindow));
+
     // Destroying the parent window of the foreign window results
     // in destroying the foreign window as well, as the foreign
     // window no longer has a parent it can be embedded in.
@@ -184,6 +187,9 @@ void tst_ForeignWindow::destroyWhenParentIsDestroyed()
     foreignWindow->create();
     QVERIFY(foreignWindow->handle());
     QTRY_COMPARE(nativeWindow.parentWinId(), parentWindow.winId());
+
+    parentWindow.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&parentWindow));
 }
 
 #include <tst_foreignwindow.moc>
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index a9e2c5f882..227fd77e1a 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -1509,6 +1509,7 @@ void tst_QWindow::touchCancelWithTouchToMouse()
 void tst_QWindow::touchInterruptedByPopup()
 {
     InputTestWindow window;
+    window.setObjectName("main");
     window.setTitle(QLatin1String(QTest::currentTestFunction()));
     window.setGeometry(QRect(m_availableTopLeft + QPoint(80, 80), m_testWindowSize));
     window.show();
@@ -1529,6 +1530,7 @@ void tst_QWindow::touchInterruptedByPopup()
 
     // Launch a popup window
     InputTestWindow popup;
+    window.setObjectName("popup");
     popup.setFlags(Qt::Popup);
     popup.setModality(Qt::WindowModal);
     popup.resize(m_testWindowSize /  2);
@@ -1551,9 +1553,6 @@ void tst_QWindow::touchInterruptedByPopup()
     QWindowSystemInterface::handleTouchEvent(&window, touchDevice, points);
     QCoreApplication::processEvents();
     QTRY_COMPARE(window.touchReleasedCount, 0);
-
-    // Due to temporary fix for QTBUG-37371: the original window should receive a TouchCancel
-    QTRY_COMPARE(window.touchEventType, QEvent::TouchCancel);
 }
 
 void tst_QWindow::orientation()