summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorck <qt-info@nokia.com>2010-03-09 15:17:57 (GMT)
committerck <qt-info@nokia.com>2010-03-09 15:18:29 (GMT)
commitcd842fd1648e58b1c9359e0a88a2a166b3b0905c (patch)
tree8bf1eff4531ef0a23627fa1bc5cb77ef005b169b /tools
parent0edda17e2edb4da968b026ac6658f740323d6dd5 (diff)
downloadQt-cd842fd1648e58b1c9359e0a88a2a166b3b0905c.zip
Qt-cd842fd1648e58b1c9359e0a88a2a166b3b0905c.tar.gz
Qt-cd842fd1648e58b1c9359e0a88a2a166b3b0905c.tar.bz2
Assistant: Fix full text indexing.
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/tools/assistant/helpenginewrapper.cpp10
-rw-r--r--tools/assistant/tools/assistant/mainwindow.cpp2
2 files changed, 3 insertions, 9 deletions
diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp
index 41ad633..9748702 100644
--- a/tools/assistant/tools/assistant/helpenginewrapper.cpp
+++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp
@@ -112,7 +112,6 @@ private:
QFileSystemWatcher * const m_qchWatcher;
typedef QPair<QDateTime, QSharedPointer<TimeoutForwarder> > RecentSignal;
QMap<QString, RecentSignal> m_recentQchUpdates;
- bool m_initialReindexingNeeded;
};
const QString HelpEngineWrapper::TrUnfiltered = tr("Unfiltered");
@@ -182,8 +181,7 @@ void HelpEngineWrapper::initialDocSetupDone()
TRACE_OBJ
connect(d->m_helpEngine, SIGNAL(setupFinished()),
searchEngine(), SLOT(indexDocumentation()));
- if (d->m_initialReindexingNeeded)
- setupData();
+ setupData();
}
QHelpSearchEngine *HelpEngineWrapper::searchEngine() const
@@ -236,7 +234,6 @@ bool HelpEngineWrapper::registerDocumentation(const QString &docFile)
return false;
d->m_qchWatcher->addPath(docFile);
d->checkDocFilesWatched();
- d->m_initialReindexingNeeded = true;
return true;
}
@@ -249,7 +246,6 @@ bool HelpEngineWrapper::unregisterDocumentation(const QString &namespaceName)
return false;
d->m_qchWatcher->removePath(file);
d->checkDocFilesWatched();
- d->m_initialReindexingNeeded = true;
return true;
}
@@ -729,8 +725,7 @@ void TimeoutForwarder::forward()
HelpEngineWrapperPrivate::HelpEngineWrapperPrivate(const QString &collectionFile)
: m_helpEngine(new QHelpEngine(collectionFile, this)),
- m_qchWatcher(new QFileSystemWatcher(this)),
- m_initialReindexingNeeded(false)
+ m_qchWatcher(new QFileSystemWatcher(this))
{
TRACE_OBJ
if (!m_helpEngine->customFilters().contains(Unfiltered))
@@ -829,7 +824,6 @@ void HelpEngineWrapperPrivate::qchFileChanged(const QString &fileName,
} else {
emit documentationUpdated(ns);
}
- m_initialReindexingNeeded = true;
m_helpEngine->setupData();
}
m_recentQchUpdates.erase(it);
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index 687e6bc..c403aa7 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -361,6 +361,7 @@ void MainWindow::qtDocumentationInstalled()
void MainWindow::checkInitState()
{
TRACE_OBJ
+ HelpEngineWrapper::instance().initialDocSetupDone();
if (!m_cmdLine->enableRemoteControl())
return;
@@ -381,7 +382,6 @@ void MainWindow::checkInitState()
}
emit initDone();
}
- HelpEngineWrapper::instance().initialDocSetupDone();
}
void MainWindow::insertLastPages()