diff options
| author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-12-22 09:04:22 (GMT) |
|---|---|---|
| committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-12-22 09:04:22 (GMT) |
| commit | ec19758c28efc6e1c712d44a6cb32ace38d3178d (patch) | |
| tree | b50b2058b7f3a566e31dbc6b86dc947273720bdd /tools/assistant/lib | |
| parent | 2a20705f874ddad55282f22fabfe30927729ae50 (diff) | |
| parent | f61a32948da3cac4b83123267ae8c5d2fa0525f6 (diff) | |
| download | Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.zip Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.tar.gz Qt-ec19758c28efc6e1c712d44a6cb32ace38d3178d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'tools/assistant/lib')
| -rw-r--r-- | tools/assistant/lib/qhelpindexwidget.cpp | 4 | ||||
| -rw-r--r-- | tools/assistant/lib/qhelpsearchengine.h | 2 |
2 files changed, 3 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(); } diff --git a/tools/assistant/lib/qhelpsearchengine.h b/tools/assistant/lib/qhelpsearchengine.h index 21f04c5..632ac0b 100644 --- a/tools/assistant/lib/qhelpsearchengine.h +++ b/tools/assistant/lib/qhelpsearchengine.h @@ -86,7 +86,9 @@ public: QHelpSearchQueryWidget* queryWidget(); QHelpSearchResultWidget* resultWidget(); +#ifdef QT_DEPRECATED QT_DEPRECATED int hitsCount() const; +#endif int hitCount() const; typedef QPair<QString, QString> SearchHit; |