--- a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp	Tue Jan 26 12:42:25 2010 +0200
+++ b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp	Tue Feb 02 00:43:10 2010 +0200
@@ -184,6 +184,7 @@
                                          const QString &indexFilesFolder,
                                          bool reindex)
 {
+    wait();
     QMutexLocker lock(&mutex);
 
     this->m_cancel = false;
@@ -274,7 +275,7 @@
                     continue;
 
                 QTextStream s(data);
-                QString en = QHelpGlobal::charsetFromData(data);
+                QString en = QHelpGlobal::codecFromData(data);
                 s.setCodec(QTextCodec::codecForName(en.toLatin1().constData()));
 
                 QString text = s.readAll();