macOS: Work around crash on exit with Qt 6.8.1

jdpurcell · Dec 3, 2024 · e9d8583 · e9d8583
1 parent 2864737
commit e9d8583
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -239,6 +239,11 @@ void MainWindow::closeEvent(QCloseEvent *event)
     QVCocoaFunctions::setFullSizeContentView(windowHandle(), false);
 #endif
 
+#if defined COCOA_LOADED && QT_VERSION == QT_VERSION_CHECK(6, 8, 1)
+    // Workaround for QTBUG-131783
+    QVCocoaFunctions::flushLastInputEvent(windowHandle());
+#endif
+
     if (qvApp->isSessionStateSaveRequested())
         qvApp->addClosedWindowSessionState(getSessionState(), getLastActivatedTimestamp());
 

diff --git a/src/qvcocoafunctions.h b/src/qvcocoafunctions.h
@@ -25,6 +25,8 @@ class QVCocoaFunctions
 
     static void closeWindow(QWindow *window);
 
+    static void flushLastInputEvent(QWindow *window);
+
     static void setWindowMenu(QMenu *menu);
 
     static void setAlternate(QMenu *menu, int index);

diff --git a/src/qvcocoafunctions.mm b/src/qvcocoafunctions.mm
@@ -155,6 +155,12 @@ static void fixNativeMenuEccentricities(QMenu *menu, NSMenu *nativeMenu)
     [view.window close];
 }
 
+void QVCocoaFunctions::flushLastInputEvent(QWindow *window)
+{
+    auto *view = reinterpret_cast<NSView*>(window->winId());
+    [view touchesCancelledWithEvent:nil];
+}
+
 void QVCocoaFunctions::setWindowMenu(QMenu *menu)
 {
     NSMenu *nativeMenu = menu->toNSMenu();