diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-14 10:30:35 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-14 10:30:35 +0100 |
| commit | a38215f03d20ccbe2e15c16d0a4e3333614cb682 (patch) | |
| tree | 0286e23d4edfab7e40198f25d1861dac3e0d7e38 /src/core/web_engine_context.cpp | |
| parent | da3c744b6a97660aae34067466d9624e1ca688e4 (diff) | |
| parent | 7a318602581fac0d4ad414ee62437554e9c9e959 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index d02202760..d48c23815 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -41,6 +41,7 @@ #include "base/base_switches.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/threading/thread_restrictions.h" #include "cc/base/switches.h" @@ -134,6 +135,9 @@ bool usingQtQuick2DRenderer() WebEngineContext::~WebEngineContext() { + base::MessagePump::Delegate *delegate = m_runLoop->loop_; + // Flush the UI message loop before quitting. + while (delegate->DoWork()) { } GLContextHelper::destroy(); m_runLoop->AfterRun(); } |