diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2020-03-19 16:10:31 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-03-19 16:10:31 +0100 |
commit | 1480922511853b20a5484d941f2d3c629768b7fe (patch) | |
tree | 4daff52de8bff80dfe5dea3ebc3fa82b97cf0047 /src/widgets | |
parent | 05dd80871c870a564a46e388d7fd124a58fc970d (diff) | |
parent | 1a18e138f4d17c219c6ffd6e4396c30b960818b4 (diff) |
Merge remote-tracking branch 'origin/5.14.2' into 5.14
Change-Id: I34ca28c75b88e882c3f35f182bf01acb22b77637
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/kernel/qtooltip.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 1ec3612457..45835a2043 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()); |