diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2013-02-07 10:24:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-12 01:31:26 +0100 |
| commit | 86115848b55faa747adf8bb39a213b3cec7673c4 (patch) | |
| tree | c6a49f6eba56f3eb2986e9f729362084948c5a78 /src/corelib/tools | |
| parent | 7abc1a6a828eb36d26901d4ea5ecf8b4514f3cd7 (diff) | |
Correctly detect HTML 5 charset attribute in QTextCodec::codecForHtml()
QTextCodec::codecForHtml currently fails to detect the charset for this
HTML:
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=9,chrome=1">
<title>Test</title>
</head>
This patch makes the detection of charsets more flexible, allowing for
the use of the HTML 5 charset attribute as well more terminator characters
("'", and ">").
I also added a *_data function for the unit tests.
Task-number: QTBUG-5451
Change-Id: I69fe4a04582f0d845cbbe9140a86a950fb7dc861
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
Diffstat (limited to 'src/corelib/tools')
0 files changed, 0 insertions, 0 deletions