diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-11-19 16:54:59 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2014-11-26 09:31:26 +0100 |
| commit | 9d771c70c35c4ba81879ede1a0b2c7298d12f931 (patch) | |
| tree | bd712cc50b89c95d2c86a8584a40490c3f22886f /src/gui/kernel/qwindowsysteminterface.cpp | |
| parent | 37cce4cadace48a22cbc5252810237341a371b10 (diff) | |
Avoid crashing on embedded
tlw can be null. handleKeyEvent() is already fixed.
Change-Id: I92ffca30841147aca4fa536b80736c799aae4ac0
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qwindowsysteminterface.cpp')
| -rw-r--r-- | src/gui/kernel/qwindowsysteminterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index ec158bdc40..32040f92e3 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -314,7 +314,7 @@ void QWindowSystemInterface::handleExtendedKeyEvent(QWindow *tlw, ulong timestam ushort count, bool tryShortcutOverride) { // on OS X we try the shortcut override even earlier and thus shouldn't handle it here - if (tryShortcutOverride && type == QEvent::KeyPress && QWindowSystemInterface::tryHandleShortcutEvent(tlw, timestamp, key, modifiers, text)) + if (tryShortcutOverride && tlw && type == QEvent::KeyPress && QWindowSystemInterface::tryHandleShortcutEvent(tlw, timestamp, key, modifiers, text)) return; QWindowSystemInterfacePrivate::KeyEvent * e = |