diff -r 56cd8111b7f7 -r 41300fa6a67c tools/assistant/lib/qhelpindexwidget.cpp --- a/tools/assistant/lib/qhelpindexwidget.cpp Tue Jan 26 12:42:25 2010 +0200 +++ b/tools/assistant/lib/qhelpindexwidget.cpp Tue Feb 02 00:43:10 2010 +0200 @@ -130,6 +130,7 @@ m_abort = true; m_mutex.unlock(); wait(); + m_abort = false; } QStringList QHelpIndexProvider::indices() const @@ -164,7 +165,6 @@ foreach (QString dbFileName, m_helpEngine->fileNameReaderMap.keys()) { m_mutex.lock(); if (m_abort) { - m_abort = false; m_mutex.unlock(); return; } @@ -181,7 +181,6 @@ foreach (QString s, lst) indicesSet.insert(s); if (m_abort) { - m_abort = false; m_mutex.unlock(); return; } @@ -194,7 +193,6 @@ m_mutex.lock(); m_indices = indicesSet.values(); qSort(m_indices.begin(), m_indices.end(), caseInsensitiveLessThan); - m_abort = false; m_mutex.unlock(); } @@ -391,8 +389,8 @@ { setEditTriggers(QAbstractItemView::NoEditTriggers); setUniformItemSizes(true); - connect(this, SIGNAL(activated(const QModelIndex&)), - this, SLOT(showLink(const QModelIndex&))); + connect(this, SIGNAL(activated(QModelIndex)), + this, SLOT(showLink(QModelIndex))); } void QHelpIndexWidget::showLink(const QModelIndex &index)