Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/corelib/codecs/qsimplecodec.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
     
    5555    quint16 values[128];
    5656} unicodevalues[QSimpleTextCodec::numSimpleCodecs] = {
     57
    5758    // from RFC 1489, ftp://ftp.isi.edu/in-notes/rfc1489.txt
    5859    { "KOI8-R", { "csKOI8R", 0 }, 2084,
     
    289290        0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B,
    290291        0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF} },
     292
    291293    { "ISO-8859-16", { "iso-ir-226", "latin10", 0 }, 112,
    292294      { 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
     
    310312
    311313    // $ for a in CP* ; do (awk '/^0x[89ABCDEF]/{ print $1, $2 }' < $a) | sort | sed -e 's/#UNDEF.*$/0xFFFD/' | cut -c6- | paste '-d ' - - - - - - - - | sed -e 's/ /, /g' -e 's/$/,/' -e '$ s/,$/} },/' -e '1 s/^/{ /' > ~/tmp/$a ; done
    312 
     314#ifndef Q_OS_SYMBIAN
    313315    { "IBM850", { "CP850", "csPC850Multilingual", 0 }, 2009,
    314316      { 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
     
    345347        0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
    346348        0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD} },
     349
    347350    { "IBM866", { "CP866", "csIBM866", 0 }, 2086,
    348351      { 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
     
    363366        0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0} },
    364367
     368
    365369    { "windows-1250", { "CP1250", 0 }, 2250,
    366370      { 0x20AC, 0xFFFD, 0x201A, 0xFFFD, 0x201E, 0x2026, 0x2020, 0x2021,
     
    517521        0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF} },
    518522
     523
    519524    { "Apple Roman", { "macintosh", "MacRoman", 0 }, -168,
    520525      { 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1,
     
    535540        0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7} },
    536541
    537 
    538 
    539542    // This one is based on the charmap file
    540543    // /usr/share/i18n/charmaps/SAMI-WS2.gz, which is manually adapted
     
    558561        0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF} },
    559562
    560 
     563#ifndef Q_OS_SYMBIAN
    561564    // this one is generated from the charmap file located in /usr/share/i18n/charmaps
    562565    // on most Linux distributions. The thai character set tis620 is byte by byte equivalent
     
    582585        0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD } },
    583586
     587
    584588    /*
    585589      Name: hp-roman8                                  [HP-PCL5,RFC1345,KXS2]
Note: See TracChangeset for help on using the changeset viewer.