summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextengine.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\
| * Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+3
|\ \ | |/
| * Merge branch '4.5'Thiago Macieira2009-06-241-0/+1
| |\
| | * Recognize | as separator characterThorbjørn Lindeijer2009-06-231-0/+1
| * | Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-3/+3
|\ \ \ | |/ /
| * | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-251-1/+1
| * | Merge branch '4.5'Thiago Macieira2009-05-221-14/+26
| |\ \ | | |/
| * | introduce Q_WS_WINCEMaurice Kalinowski2009-04-291-2/+2
| * | Long live Qt!Lars Knoll2009-03-231-0/+2648
| /
* | Make Qt exception safer.Robert Griebl2009-06-101-4/+6
|/
* Fixed potential bug caused by change b89efc8e7f32.Samuel Rødal2009-05-221-1/+1
* Fixed text shaping bugs with ligatures and multiple font engines.Samuel Rødal2009-05-221-14/+26
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+2648