Merge pull request #13856 from sethalves/dont-squash-delete-events

don't squash delete events during shutdown so that QtWebEngine process gets destoryed
This commit is contained in:
John Conklin II 2018-08-22 12:44:35 -07:00 committed by GitHub
commit 50684f00c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3659,7 +3659,7 @@ bool Application::event(QEvent* event) {
bool Application::eventFilter(QObject* object, QEvent* event) {
if (_aboutToQuit) {
if (_aboutToQuit && event->type() != QEvent::DeferredDelete && event->type() != QEvent::Destroy) {
return true;
}