summaryrefslogtreecommitdiffstats
path: root/src/corelib/codecs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-2/+0
|\
| * Fix compilation on Mac 32-bit.Thiago Macieira2010-02-171-1/+1
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-181-5/+0
|\ \
| * | Remove these friend declarations that aren't necessary in 4.7Thiago Macieira2010-02-171-5/+0
* | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-172-9/+45
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-161-9/+43
| |\
| | * QTextCodec::codecForName. Insert in the cache in all cases.Olivier Goffart2010-02-151-1/+3
| | * QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec ...Olivier Goffart2010-02-121-5/+6
| | * Add caching to QTextCodec::codecForName and QTextCodec::codecForMibOlivier Goffart2010-02-121-4/+35
| * | Fixed compiler warning about making the same class a friend twiceZeno Albisser2010-02-161-0/+2
| |/
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-122-9/+39
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-082-9/+39
| |\
| | * Make QTextCodec reentrant.Olivier Goffart2010-02-082-9/+39
* | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-2/+2
|\ \ \ | |/ /
| * | A fix for accidently reused variable names in nested iterations.Zeno Albisser2010-02-051-2/+2
| |/
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-041-4/+3
|\ \ | |/
| * remove pointless conditionalsOswald Buddenhagen2010-02-011-3/+2
| * micro-optimizationOswald Buddenhagen2010-02-011-1/+1
* | Merge branch '4.6'Thiago Macieira2010-01-1320-20/+25
|\ \ | |/
| * Prospective Qt/Mac build fixSimon Hausmann2010-01-071-0/+2
| * Temporary hackiesh solution to prevent BOM in the xml data.Denis Dzyubenko2010-01-061-0/+3
| * Update copyright year to 2010Jason McDonald2010-01-0620-20/+20
* | Added new functions to QTextCodec that accept ConversionFlags.Denis Dzyubenko2010-01-082-3/+57
|/
* Document QTextEncoder::fromUnicode as QT3 support memberAnders Ahlen2009-12-111-1/+1
* Checks for len = 0 in QIconvCodec::convertFromUnicodeNils Christian Roscher-Nielsen2009-11-251-2/+2
* remove bogus doc paragraphs relating to codecForUtfText()Oswald Buddenhagen2009-11-191-6/+0
* move doc next to implementationOswald Buddenhagen2009-10-051-23/+20
* Added qtextcodec_p.h to the project file.Denis Dzyubenko2009-10-051-0/+1
* Fixed parsing of html header in the qtextcodec.Denis Dzyubenko2009-09-231-6/+8
* Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-09-141-1/+1
|\
| * Fix libiconv support on FreeBSD.Raphael Kubo da Costa2009-09-131-1/+1
| * Update license headers again.Jason McDonald2009-09-0819-76/+76
* | Update license headers again.Jason McDonald2009-09-0920-80/+80
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3120-260/+260
|\ \ | |/
| * Update tech preview license header.Jason McDonald2009-08-3119-247/+247
| * Eliminate some mentions of Trolltech.Jason McDonald2009-08-112-2/+2
| * Update license headers.Jason McDonald2009-08-1119-19/+19
* | Merge commit 'qt/master'Jason Barron2009-08-201-0/+1
|\ \
| * | Instantiate the CP949 codec when building with -no-iconvBradley T. Hughes2009-08-201-0/+1
* | | Merge commit 'qt/master'Jason Barron2009-08-182-1/+547
|\ \ \ | |/ /
| * | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-171-0/+546
| * | Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-1/+1
* | | remove a ### commentLars Knoll2009-08-141-3/+1
* | | Merge commit 'qt/master'Jason Barron2009-08-1319-21/+21
|\ \ \ | |/ /
| * | Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-122-2/+2
| * | Update contact URL in license headers.Jason McDonald2009-08-1219-19/+19
* | | Merge commit 'qt/master-stable'Jason Barron2009-08-042-4/+4
|\ \ \ | |/ /
| * | Port of Qt to QNXHarald Fernengel2009-07-292-4/+4
* | | Merge commit 'qt/master-stable'Jason Barron2009-07-275-206/+280
|\ \ \ | |/ /
| * | Doc: small improvementsVolker Hilsheimer2009-07-201-5/+20