diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-28 11:51:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-28 11:51:35 +0200 |
| commit | e918334045612ec2c7c6203845ad05c4a1972e87 (patch) | |
| tree | b59bf3a173c6bfa58c3ba9b5bb80df4a093247dc /src/widgets/kernel/qapplication.cpp | |
| parent | e3cbf0f1962958457f6e09fcfdc92d8cac4b6511 (diff) | |
| parent | cf0119bb69592d58ca7e6a75753799ebae61e4b5 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/widgets/dialogs/qcolordialog.cpp
src/widgets/dialogs/qfiledialog.cpp
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
Change-Id: I34bc8a990f8f526889a95a5c7099ef557b9681ad
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 4dc04c5fa1..1b77d74cd0 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -3174,11 +3174,11 @@ bool QApplication::notify(QObject *receiver, QEvent *e) key->accept(); else key->ignore(); - res = d->notify_helper(receiver, e); QWidget *w = isWidget ? static_cast<QWidget *>(receiver) : 0; #ifndef QT_NO_GRAPHICSVIEW QGraphicsWidget *gw = isGraphicsWidget ? static_cast<QGraphicsWidget *>(receiver) : 0; #endif + res = d->notify_helper(receiver, e); if ((res && key->isAccepted()) /* |