diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-02-17 12:50:24 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-03 08:04:53 +0000 |
| commit | 6cff40c1959a57b52bf0be6b427b0f807e0e82b4 (patch) | |
| tree | baa503c8dd39139b32af2cb6ff9c1a370fe7944b /src/widgets/kernel/qwhatsthis.cpp | |
| parent | 585bb526c4b9d810979c498e03fd2ecec54e1432 (diff) | |
Build fix for -no-feature-shortcut
Change-Id: I99144b114b3c2eacb56b522b3059aa53a6bbd969
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/widgets/kernel/qwhatsthis.cpp')
| -rw-r--r-- | src/widgets/kernel/qwhatsthis.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 6061af5f38..4286019717 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -462,11 +462,13 @@ bool QWhatsThisPrivate::eventFilter(QObject *o, QEvent *e) case QEvent::KeyPress: { QKeyEvent* kev = (QKeyEvent*)e; - +#if QT_CONFIG(shortcut) if (kev->matches(QKeySequence::Cancel)) { QWhatsThis::leaveWhatsThisMode(); return true; - } else if (customWhatsThis) { + } else +#endif + if (customWhatsThis) { return false; } else if (kev->key() == Qt::Key_Menu || (kev->key() == Qt::Key_F10 && |