diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-12 06:50:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-12 06:50:55 (GMT) |
| commit | b1906f053ec1a9c90c4df1870568e3036fae6b9b (patch) | |
| tree | 09d595ad5e698561f7b094dab2983bed350ec7c6 /tools/assistant/lib | |
| parent | 1860aa75013a4d91b553c9dadf8130cc06a96641 (diff) | |
| parent | dacbb8b055815f629e2eeccdb7d4ca4cc5a2f839 (diff) | |
| download | Qt-b1906f053ec1a9c90c4df1870568e3036fae6b9b.zip Qt-b1906f053ec1a9c90c4df1870568e3036fae6b9b.tar.gz Qt-b1906f053ec1a9c90c4df1870568e3036fae6b9b.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Update Polish translations
Assistant: Add documentation for -remove-search-index.
Designer: Handle "visible"-properties of item view headers correctly.
Fix .gitignore to not ignore qdoc.pro
Update polish translations
Fix broken delete key, some cleanup.
Assistant: Fix race condition in index creation.
Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
Diffstat (limited to 'tools/assistant/lib')
| -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(); } |