Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: Ib2a2e3a292af43be3a980c2ccc943c08f4bbf72f

1 files changed, 4 insertions, 4 deletions

diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp
index 33dd3e59b67..661568dcadf 100644
--- a/src/widgets/kernel/qtooltip.cpp
+++ b/src/widgets/kernel/qtooltip.cpp
@@ -402,10 +402,10 @@ void QTipLabel::placeTip(const QPoint &pos, QWidget *w)
 #endif //QT_NO_STYLE_STYLESHEET
 
     QPoint p = pos;
-    int screenNumber = getTipScreen(pos, w);
-    QScreen *screen = QGuiApplication::screens().at(screenNumber);
-    if (screen) {
-        const QPlatformScreen *platformScreen = screen->handle();
+    const QScreen *screen = QGuiApplication::screens().value(getTipScreen(pos, w),
+                                                             QGuiApplication::primaryScreen());
+    // a QScreen's handle *should* never be null, so this is a bit paranoid
+    if (const QPlatformScreen *platformScreen = screen ? screen->handle() : nullptr) {
         const QSize cursorSize = QHighDpi::fromNativePixels(platformScreen->cursor()->size(),
                                                             platformScreen);
         QPoint offset(2, cursorSize.height());