diff options
| author | Bill King <bill.king@nokia.com> | 2009-12-03 22:22:49 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-12-03 22:22:49 (GMT) |
| commit | a2eda737c58434ee2604b6466dcf3212a35b604f (patch) | |
| tree | 76ba6e2b1b192e6d2dc1aede3ca7072993b32402 /tools | |
| parent | 1b4ff1bab4ccc4bdc403b84920314f76fbca02c5 (diff) | |
| parent | 68f4b46426e715540864046128617250a521d38a (diff) | |
| download | Qt-a2eda737c58434ee2604b6466dcf3212a35b604f.zip Qt-a2eda737c58434ee2604b6466dcf3212a35b604f.tar.gz Qt-a2eda737c58434ee2604b6466dcf3212a35b604f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp | 1 | ||||
| -rw-r--r-- | tools/assistant/lib/qhelpsearchindexwriter_default.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp index ab32537..b9aedbe 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp @@ -578,6 +578,7 @@ void QHelpSearchIndexWriter::cancelIndexing() void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile, const QString &indexFilesFolder, bool reindex) { + wait(); mutex.lock(); this->m_cancel = false; this->m_reindex = reindex; diff --git a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp index 06deb85..60b9642 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp @@ -184,6 +184,7 @@ void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile, const QString &indexFilesFolder, bool reindex) { + wait(); QMutexLocker lock(&mutex); this->m_cancel = false; |