1 files changed, 11 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index c25f67faf8..8131c314d7 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -125,6 +125,7 @@
 #include <qtgui_tracepoints_p.h>
 
 #include <ctype.h>
+#include <limits>
 
 QT_BEGIN_NAMESPACE
 
@@ -142,7 +143,7 @@ Q_GUI_EXPORT bool qt_is_gui_used = true;
 Qt::MouseButtons QGuiApplicationPrivate::mouse_buttons = Qt::NoButton;
 Qt::KeyboardModifiers QGuiApplicationPrivate::modifier_buttons = Qt::NoModifier;
 
-QPointF QGuiApplicationPrivate::lastCursorPosition(qt_inf(), qt_inf());
+QGuiApplicationPrivate::QLastCursorPosition QGuiApplicationPrivate::lastCursorPosition;
 
 QWindow *QGuiApplicationPrivate::currentMouseWindow = nullptr;
 
@@ -704,7 +705,7 @@ QGuiApplication::~QGuiApplication()
     QGuiApplicationPrivate::desktopFileName = nullptr;
     QGuiApplicationPrivate::mouse_buttons = Qt::NoButton;
     QGuiApplicationPrivate::modifier_buttons = Qt::NoModifier;
-    QGuiApplicationPrivate::lastCursorPosition = {qreal(qInf()), qreal(qInf())};
+    QGuiApplicationPrivate::lastCursorPosition.reset();
     QGuiApplicationPrivate::currentMousePressWindow = QGuiApplicationPrivate::currentMouseWindow = nullptr;
     QGuiApplicationPrivate::applicationState = Qt::ApplicationInactive;
     QGuiApplicationPrivate::currentDragWindow = nullptr;
@@ -4140,6 +4141,14 @@ QPixmap QGuiApplicationPrivate::getPixmapCursor(Qt::CursorShape cshape)
     return QPixmap();
 }
 
+QPoint QGuiApplicationPrivate::QLastCursorPosition::toPoint() const noexcept
+{
+    // Guard against the default initialization of qInf() (avoid UB or SIGFPE in conversion).
+    if (Q_UNLIKELY(qIsInf(thePoint.x())))
+        return QPoint(std::numeric_limits<int>::max(), std::numeric_limits<int>::max());
+    return thePoint.toPoint();
+}
+
 void QGuiApplicationPrivate::notifyThemeChanged()
 {
     updatePalette();