diff options
| author | ck <qt-info@nokia.com> | 2009-11-05 12:54:19 (GMT) |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2009-11-05 12:54:19 (GMT) |
| commit | 0d637ac6a852fb098e1945446536d1b15f5d8660 (patch) | |
| tree | 8ad44ac9f6bf8e3822a9cb80e2436bd3020aa960 /tools/assistant/lib/qhelpgenerator.cpp | |
| parent | bc5ff9a1fc9982d8669324fde2103dd447486860 (diff) | |
| download | Qt-0d637ac6a852fb098e1945446536d1b15f5d8660.zip Qt-0d637ac6a852fb098e1945446536d1b15f5d8660.tar.gz Qt-0d637ac6a852fb098e1945446536d1b15f5d8660.tar.bz2 | |
Assistant: Look for document encoding in XML headers as well.
Task-number: QTBUG-1770
Reviewed-by: kh1
Conflicts:
tools/assistant/lib/lib.pro
Diffstat (limited to 'tools/assistant/lib/qhelpgenerator.cpp')
| -rw-r--r-- | tools/assistant/lib/qhelpgenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/assistant/lib/qhelpgenerator.cpp b/tools/assistant/lib/qhelpgenerator.cpp index 0294b30..48d73aa 100644 --- a/tools/assistant/lib/qhelpgenerator.cpp +++ b/tools/assistant/lib/qhelpgenerator.cpp @@ -528,7 +528,7 @@ bool QHelpGenerator::insertFiles(const QStringList &files, const QString &rootPa 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()); |