Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake

2 files changed, 10 insertions, 3 deletions

diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp
index 1ce947165d..3d525598ca 100644
--- a/src/plugins/platforms/xcb/qxcbdrag.cpp
+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
@@ -354,6 +354,11 @@ bool QXcbDrag::findXdndAwareTarget(const QPoint &globalPos, xcb_window_t *target
 
 void QXcbDrag::move(const QPoint &globalPos, Qt::MouseButtons b, Qt::KeyboardModifiers mods)
 {
+    // currentDrag() might be deleted while 'drag' is progressing
+    if (!currentDrag()) {
+        cancel();
+        return;
+    }
     // The source sends XdndEnter and XdndPosition to the target.
     if (source_sameanswer.contains(globalPos) && source_sameanswer.isValid())
         return;
@@ -1076,7 +1081,8 @@ void QXcbDrag::cancel()
         send_leave();
 
     // remove canceled object
-    currentDrag()->deleteLater();
+    if (currentDrag())
+        currentDrag()->deleteLater();
 
     canceled = true;
 }
diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
index 2303ccf806..f880d4d722 100644
--- a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
+++ b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
@@ -42,6 +42,8 @@
 
 #ifndef QT_NO_SESSIONMANAGER
 
+#include <qpa/qwindowsysteminterface.h>
+
 #include <qguiapplication.h>
 #include <qdatetime.h>
 #include <qfileinfo.h>
@@ -289,8 +291,7 @@ static void sm_dieCallback(SmcConn smcConn, SmPointer /* clientData */)
     if (smcConn != smcConnection)
         return;
     resetSmState();
-    QEvent quitEvent(QEvent::Quit);
-    QGuiApplication::sendEvent(qApp, &quitEvent);
+    QWindowSystemInterface::handleApplicationTermination<QWindowSystemInterface::SynchronousDelivery>();
 }
 
 static void sm_shutdownCancelledCallback(SmcConn smcConn, SmPointer clientData)