summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qcssparser.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\
| * 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-43/+3
|\ \ \ | |/ /
| * | small improvement/refactor to cssparserThierry Bastian2009-06-091-41/+1
| * | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-251-2/+2
| |/
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-201-7/+12
|\ \ | |/
| * QCss: font-family handle fallback font specsOlivier Goffart2009-05-181-7/+12
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-111-10/+6
|\ \ | |/
| * Fix reentrency of the QCSS engine.Olivier Goffart2009-05-081-10/+6
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+2808
* Long live Qt for S60!axis2009-04-241-0/+2809