summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-08 10:43:36 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-08 10:43:36 (GMT)
commitab4002004b59aaa900962d5e39c8186e909f327f (patch)
treeac92a4f489c0a93a48eb502457c679659e472ac0 /src/testlib
parent1dd26ea2486db87b61e8e9f70a1e04f7386405ef (diff)
parent978e22d6529d7cbe9472749352d632eefd22cd07 (diff)
downloadQt-ab4002004b59aaa900962d5e39c8186e909f327f.zip
Qt-ab4002004b59aaa900962d5e39c8186e909f327f.tar.gz
Qt-ab4002004b59aaa900962d5e39c8186e909f327f.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix S60 compile Remove some metrics parsing code from Core Text Fix compilation with c++0x mode Fix Windows compile Move styleName out of QtFontStyle::Key Fix regressions in previous QFontDatabase patch Don't issue GL calls when the geometry is empty Fixed missing painting with X11 paint engine. Add font related changes in 4.8 into changes Store styleName in font database update 4.8.0 changes file Fix resource leak in QFontEngineDirectWrite Fix transformations on DirectWrite rasterized text Remove openvglite plugin
Diffstat (limited to 'src/testlib')
0 files changed, 0 insertions, 0 deletions