diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 23:41:33 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-19 23:41:33 +0200 |
| commit | 42dabaf83563a373e8796914c2aa25dc4b54cc13 (patch) | |
| tree | 78eed006f9ca76b6cb2cfc7b0e7ace208f417b3f /Source | |
| parent | f0fad828aa39347da60efee4ea461ee00a04b50e (diff) | |
| parent | 4af31da26f816a7abc06924253f7924dbad15991 (diff) | |
| download | qtwebkit-42dabaf83563a373e8796914c2aa25dc4b54cc13.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
Source/WebCore/platform/graphics/Font.cpp
Change-Id: I0961de8127cf1c8233036038a324c2567a70533e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/platform/graphics/Font.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/Font.cpp b/Source/WebCore/platform/graphics/Font.cpp index 64469681a..c3cca6ee9 100644 --- a/Source/WebCore/platform/graphics/Font.cpp +++ b/Source/WebCore/platform/graphics/Font.cpp @@ -795,7 +795,7 @@ bool Font::isCJKIdeographOrSymbol(UChar32 c) if (c >= 0x1F170 && c <= 0x1F189) return true; - if (c >= 0x1F200 && c <= 0x1F6F) + if (c >= 0x1F200 && c <= 0x1F6C5) return true; return isCJKIdeograph(c); |