diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-15 17:45:47 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-04-15 17:45:47 +0200 |
| commit | 50fe3585a890fdbb5b6b8598bd8ffe97c036b52d (patch) | |
| tree | c7b4e55ac4953b344a56f54c0c272d2d324a16c8 /src/plugins/help | |
| parent | 3d6d33f60d666c8cdab0aa7bad2ee417323b2ee0 (diff) | |
| parent | bd964ab0be5070c47a2c65813760413596b028e1 (diff) | |
| download | qt-creator-50fe3585a890fdbb5b6b8598bd8ffe97c036b52d.tar.gz | |
Merge remote-tracking branch 'origin/3.4'
Conflicts:
src/libs/timeline/qml/MainView.qml
src/plugins/git/gitclient.cpp
Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
Diffstat (limited to 'src/plugins/help')
| -rw-r--r-- | src/plugins/help/helpplugin.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 2ad2dbcbe0..d03a2dfe1e 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -665,7 +665,6 @@ void HelpPlugin::doSetupIfNeeded() { LocalHelpManager::setupGuiHelpEngine(); if (m_setupNeeded) { - qApp->processEvents(); resetFilter(); m_setupNeeded = false; OpenPagesManager::instance().setupInitialPages(); |