summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase.cpp
Commit message (Expand)AuthorAgeFilesLines
* Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-1/+3
* Make S60 integration optional.Jason Barron2009-07-151-21/+21
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-3/+3
|\
| * Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-231-1/+1
| |\
| | * Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-231-1/+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-20/+20
|\ \ \ | |/ /
| * | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-111-18/+18
| * | Merge branch '4.5'Denis Dzyubenko2009-06-021-1/+1
| |\ \ | | |/
| * | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-251-2/+2
| * | Long live Qt!Lars Knoll2009-03-231-0/+2435
| /
* | Make Qt exception safer.Robert Griebl2009-06-101-12/+29
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-081-1/+1
|\ \ | |/
| * BT: Remove duplicate code and fix font parsing.Norwegian Rock Cat2009-06-021-1/+1
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+2435
* Long live Qt for S60!axis2009-04-241-0/+2586