diff options
| author | ck <qt-info@nokia.com> | 2009-11-05 10:16:21 (GMT) |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2009-11-05 10:16:21 (GMT) |
| commit | 8d989dc8984161d93dd03bdc370c5b59df3d39db (patch) | |
| tree | 1f9dec494b99a41d190e2117c6f64a6ffddc48b5 /tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp | |
| parent | 43d654e4d38b998972fa97ab2c23720db3fef8bb (diff) | |
| download | Qt-8d989dc8984161d93dd03bdc370c5b59df3d39db.zip Qt-8d989dc8984161d93dd03bdc370c5b59df3d39db.tar.gz Qt-8d989dc8984161d93dd03bdc370c5b59df3d39db.tar.bz2 | |
Assistant: Look for document encoding in XML headers as well.
Task-number: QTBUG-1770
Reviewed-by: kh1
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 80ee933..f23efa5 100644 --- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp +++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp @@ -431,8 +431,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()) |