summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontdatabase.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-7/+13
|\
| * Avoid possible font name collisions on fbservAlessandro Portale2011-01-241-0/+4
| * Supporting Qt application fonts on SymbianAlessandro Portale2011-01-191-7/+9
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\ \ | |/
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | Make application font family names locale sensitive in X11Jiang Jiang2011-01-061-0/+3
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-4/+6
|\ \
| * | Replaced sample text for Japanese fontTasuku Suzuki2010-10-201-4/+6
* | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-09-131-19/+48
|\ \ \
| * | | Initial pluggable fontdatabaseJørgen Lind2010-09-021-19/+48
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-191-4/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Remove obsolete code & workarounds for unsupported versions of MS Visual C++miniak2010-08-031-4/+0
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouseJørgen Lind2010-06-241-1/+1
|\ \ | |/
| * Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
* | Say hello to Q_WS_QPA!Jørgen Lind2010-06-241-20/+20
* | Merge remote branch 'qt/4.7' into lighthousePaul Olav Tvete2010-06-181-4/+9
|\ \ | |/
| * Allocate the memory for QtFontSize when count > 1Benjamin Poulain2010-06-161-1/+1
| * Reduce the memory consumption of QtFontStyleBenjamin Poulain2010-06-161-4/+9
* | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-05-101-7/+7
|\ \ | |/
| * Renaming a few unexported, private symbolsAlessandro Portale2010-04-281-7/+7
* | Merge remote branch 'origin/4.7' into lighthouseJørgen Lind2010-04-211-1/+1
|\ \ | |/
| * Symbol visibility fixes for RVCT4 on SymbianIain2010-04-151-1/+1
* | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2010-01-141-8/+8
|\ \ | |/
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| * Doc: Fixed references to "old" 2.x and "new" 3.x font name conventions.David Boddie2009-12-071-7/+7
* | Merge remote branch 'origin/4.6' into lighthousePaul Olav Tvete2009-11-191-5/+22
|\ \ | |/
| * CompileEskil Abrahamsen Blomfeldt2009-11-061-1/+1
| * add support for the N'Ko writing system to QtLars Knoll2009-11-061-3/+20
| * Line spacing fixesJoerg Bornemann2009-10-231-1/+1
* | Merge branch '4.6' into lighthousePaul Olav Tvete2009-10-141-2/+7
|\ \ | |/
| * Second attempt: Fixed a few compiler warnings from QtGui for Symbian.Janne Anttila2009-10-131-0/+1
| * Revert "Fixed a few compiler warnings from QtGui for Symbian."Janne Anttila2009-10-131-1/+0
| * Fixed a few compiler warnings from QtGui for Symbian.Janne Anttila2009-10-131-0/+1
| * Fix compile error on symbian platformShane Kearns2009-10-091-0/+4
| * Fix printing bitmap fonts on X11 with FontConfig enabledEskil Abrahamsen Blomfeldt2009-10-091-3/+3
* | Merge branch '4.6' into lighthousePaul Olav Tvete2009-09-301-6/+6
|\ \ | |/
| * Removed some superfluous semicolonsAlessandro Portale2009-09-091-2/+2
| * Update license headers again.Jason McDonald2009-09-091-4/+4
* | Please welcome the Lighthouse Research Project!Paul Olav Tvete2009-09-071-20/+22
|/
* Removing a few superfluous semicolons.Alessandro Portale2009-09-031-1/+1
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\
| * Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * Update license headers.Jason McDonald2009-08-111-1/+1
* | Merge commit 'qt/master'Jason Barron2009-08-181-4/+2
|\ \
| * | Restructure the documentation, both on a file and on a content level.Volker Hilsheimer2009-08-171-4/+2
* | | Merge commit 'qt/master'Jason Barron2009-08-131-1/+1
|\ \ \ | |/ /
| * | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* | | RVCT didn't like a test bool variable exported directly from QtGui,Miikka Heikkinen2009-08-111-2/+7
* | | Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-031-1/+3
* | | Make S60 integration optional.Jason Barron2009-07-151-21/+21