diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-19 08:28:14 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-19 08:34:01 +0200 |
| commit | 6d61b10f65cd276e009a02cec563cc469245e1f2 (patch) | |
| tree | d04fbfd17a3cdca95b0abf9825eab2cd64858b6f /src/gui/kernel/qhighdpiscaling.cpp | |
| parent | a3e69954f57a513b8bfa0a0865753fa6449fe15b (diff) | |
High DPI: Fix crash in QWindow::mapFromGlobal()
With Web Engine, QQuickWidget or similar, the code can hit on the offscreen
window, when its handle is null. Add a check.
Amends 3af7b279177f7fb092f0e0fb9ffc8e8d846ed774.
Fixes: QTBUG-76440
Change-Id: I123633d18386efd3dbfb22aad6072e4f0877a62e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/gui/kernel/qhighdpiscaling.cpp')
| -rw-r--r-- | src/gui/kernel/qhighdpiscaling.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp index 4f8e9a3817..93fcb1a216 100644 --- a/src/gui/kernel/qhighdpiscaling.cpp +++ b/src/gui/kernel/qhighdpiscaling.cpp @@ -400,7 +400,7 @@ QPoint QHighDpiScaling::mapPositionToGlobal(const QPoint &pos, const QPoint &win QPoint QHighDpiScaling::mapPositionFromGlobal(const QPoint &pos, const QPoint &windowGlobalPosition, const QWindow *window) { QPoint windowPosCandidate = pos - windowGlobalPosition; - if (QGuiApplicationPrivate::screen_list.size() <= 1) + if (QGuiApplicationPrivate::screen_list.size() <= 1 || window->handle() == nullptr) return windowPosCandidate; // Device independent global (screen) space may discontiguous when high-dpi scaling |