summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2014-09-19 09:52:42 (GMT)
committerShawn Rutledge <shawn.rutledge@digia.com>2015-03-26 14:45:42 (GMT)
commit3f2f403191ea5a38c66b79840e3a33e05827d580 (patch)
treedfbf5f39470c142426141aa9bb56e72c5fb6344e
parent363c9aba772b20d2df9070be730ffb36775b6f2b (diff)
downloadQt-3f2f403191ea5a38c66b79840e3a33e05827d580.zip
Qt-3f2f403191ea5a38c66b79840e3a33e05827d580.tar.gz
Qt-3f2f403191ea5a38c66b79840e3a33e05827d580.tar.bz2
Assistant: Fix index updating on startup in the remote control mode
HelpEngineWrapper::initialDocSetupDone() should be called only once right after the initialization of the help models. Calling it on every small update leads to recursion. Task-number: QTBUG-36850 (cherry picked from qttools/d55407822eefbc05f7d8bb44c53b057332b5b399) Change-Id: I3e0390e592069a417d88fbc202a1e45cd91cc139 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
-rw-r--r--tools/assistant/tools/assistant/mainwindow.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index f925248..123d432 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -398,9 +398,10 @@ void MainWindow::qtDocumentationInstalled()
void MainWindow::checkInitState()
{
TRACE_OBJ
- HelpEngineWrapper::instance().initialDocSetupDone();
- if (!m_cmdLine->enableRemoteControl())
+ if (!m_cmdLine->enableRemoteControl()) {
+ HelpEngineWrapper::instance().initialDocSetupDone();
return;
+ }
HelpEngineWrapper &helpEngine = HelpEngineWrapper::instance();
if (helpEngine.contentModel()->isCreatingContents()
@@ -417,6 +418,7 @@ void MainWindow::checkInitState()
disconnect(helpEngine.contentModel(), 0, this, 0);
disconnect(helpEngine.indexModel(), 0, this, 0);
}
+ HelpEngineWrapper::instance().initialDocSetupDone();
emit initDone();
}
}