diff -r 56cd8111b7f7 -r 41300fa6a67c tools/assistant/lib/qhelpgenerator.cpp
--- a/tools/assistant/lib/qhelpgenerator.cpp	Tue Jan 26 12:42:25 2010 +0200
+++ b/tools/assistant/lib/qhelpgenerator.cpp	Tue Feb 02 00:43:10 2010 +0200
@@ -528,7 +528,7 @@
         QByteArray data = fi.readAll();
         if (fileName.endsWith(QLatin1String(".html"))
             || fileName.endsWith(QLatin1String(".htm"))) {
-                charSet = QHelpGlobal::charsetFromData(data);
+                charSet = QHelpGlobal::codecFromData(data);
                 QTextStream stream(&data);
                 stream.setCodec(QTextCodec::codecForName(charSet.toLatin1().constData()));
                 title = QHelpGlobal::documentTitle(stream.readAll());