Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
authorJanne Koskinen <janne.p.koskinen@digia.com>
Thu, 8 Apr 2010 10:11:44 +0000 (13:11 +0300)
committerJanne Koskinen <janne.p.koskinen@digia.com>
Thu, 8 Apr 2010 10:11:44 +0000 (13:11 +0300)
commit3c546be51dbdc1064a14cfcd178f7fbb5c6bff75
treeef71de22ce4aa42726c2715b2bac42fe3f6646fb
parent4c425feb08cd4aad31a99e92fec3fbbde0349d95
parentd248e431e259cdb31c7634507a09a9f6d39711c3
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
src/gui/text/qfont.cpp