diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-12-18 09:07:46 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-12-18 09:07:46 (GMT) |
| commit | 0d212670c06ed54ac785e0bb945c792947d388f5 (patch) | |
| tree | c4f6c6762ad42df463f30e05e090fa2cfa9de77a /tools/assistant/lib/qhelpindexwidget.cpp | |
| parent | 371420d5f31a04b91c01807139d49e97db040bee (diff) | |
| parent | 7c1283fca1ef2e742b5794600e00edf0c3e3020f (diff) | |
| download | Qt-0d212670c06ed54ac785e0bb945c792947d388f5.zip Qt-0d212670c06ed54ac785e0bb945c792947d388f5.tar.gz Qt-0d212670c06ed54ac785e0bb945c792947d388f5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'tools/assistant/lib/qhelpindexwidget.cpp')
| -rw-r--r-- | tools/assistant/lib/qhelpindexwidget.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/assistant/lib/qhelpindexwidget.cpp b/tools/assistant/lib/qhelpindexwidget.cpp index 475a1fe..6cf1a72 100644 --- a/tools/assistant/lib/qhelpindexwidget.cpp +++ b/tools/assistant/lib/qhelpindexwidget.cpp @@ -130,6 +130,7 @@ void QHelpIndexProvider::stopCollecting() m_abort = true; m_mutex.unlock(); wait(); + m_abort = false; } QStringList QHelpIndexProvider::indices() const @@ -164,7 +165,6 @@ void QHelpIndexProvider::run() foreach (QString dbFileName, m_helpEngine->fileNameReaderMap.keys()) { m_mutex.lock(); if (m_abort) { - m_abort = false; m_mutex.unlock(); return; } @@ -181,7 +181,6 @@ void QHelpIndexProvider::run() foreach (QString s, lst) indicesSet.insert(s); if (m_abort) { - m_abort = false; m_mutex.unlock(); return; } @@ -194,7 +193,6 @@ void QHelpIndexProvider::run() m_mutex.lock(); m_indices = indicesSet.values(); qSort(m_indices.begin(), m_indices.end(), caseInsensitiveLessThan); - m_abort = false; m_mutex.unlock(); } |