diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:49:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-14 10:52:24 +0100 |
| commit | 0c034a649f61019c16aba479fe79d20dde41f2f2 (patch) | |
| tree | 54545862591044b65e618989805945bceb0b3ea5 /src/widgets/util/qcompleter.cpp | |
| parent | 2162f01111d21d0ce66ceb8be290b0a13653e691 (diff) | |
| parent | df40b1115db600e8de1c4774476fa30956a34fd9 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qpushbutton.cpp
Change-Id: I615de00e6e64540c50f658d4d8ab3e002d701a81
Diffstat (limited to 'src/widgets/util/qcompleter.cpp')
| -rw-r--r-- | src/widgets/util/qcompleter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index 3006f0c9ce..e8f23f08bc 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -1347,11 +1347,12 @@ bool QCompleter::eventFilter(QObject *o, QEvent *e) } // default implementation for keys not handled by the widget when popup is open +#if QT_CONFIG(shortcut) if (ke->matches(QKeySequence::Cancel)) { d->popup->hide(); return true; } - +#endif switch (key) { #ifdef QT_KEYPAD_NAVIGATION case Qt::Key_Select: |