summaryrefslogtreecommitdiffstats
path: root/examples/painting/fontsampler
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-21 11:46:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-21 11:46:12 (GMT)
commit8ec200f756b021b5c79bcd328815efc5eafda578 (patch)
tree812bda566cda555575c75cb8d5cf9d6540334732 /examples/painting/fontsampler
parent6122f0746cac1008d967c19a8b609d7c92fbc8a5 (diff)
parent2701802511d9c09a11212cc37838154245b0c0ca (diff)
downloadQt-8ec200f756b021b5c79bcd328815efc5eafda578.zip
Qt-8ec200f756b021b5c79bcd328815efc5eafda578.tar.gz
Qt-8ec200f756b021b5c79bcd328815efc5eafda578.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Update autotest case after toHtml change Proper fix for previous deallocation problem No need to destroy match pattern again Fix fontconfig usage in X11 font database Fix empty lines in Qt HTML when displayed in external browsers (again) Make it possible to set color of QStaticText with pixel size >= 64
Diffstat (limited to 'examples/painting/fontsampler')
0 files changed, 0 insertions, 0 deletions