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/qhelpsearchindexwriter_clucene.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/qhelpsearchindexwriter_clucene.cpp')
| -rw-r--r-- | tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp index 284cbd3..ab32537 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp @@ -430,8 +430,8 @@ private: 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()) |