diff -r 56cd8111b7f7 -r 41300fa6a67c tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
--- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp	Tue Jan 26 12:42:25 2010 +0200
+++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp	Tue Feb 02 00:43:10 2010 +0200
@@ -430,8 +430,8 @@
     QString readData(const QByteArray &data)
     {
         QTextStream textStream(data);
-        QByteArray charSet = QHelpGlobal::charsetFromData(data).toLatin1();
-        textStream.setCodec(QTextCodec::codecForName(charSet.constData()));
+        const QByteArray &codec = QHelpGlobal::codecFromData(data).toLatin1();
+        textStream.setCodec(QTextCodec::codecForName(codec.constData()));
 
         QString stream = textStream.readAll();
         if (stream.isNull() || stream.isEmpty())
@@ -578,6 +578,7 @@
 void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile,
     const QString &indexFilesFolder, bool reindex)
 {
+    wait();
     mutex.lock();
     this->m_cancel = false;
     this->m_reindex = reindex;