summaryrefslogtreecommitdiffstats
path: root/src/tools/moc/token.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-18 20:29:29 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-18 20:29:29 (GMT)
commit9ff0ba6375695d777ee268ae6682189d9245fbef (patch)
tree6620af259dd879a7154afd976c3040fcee8ec951 /src/tools/moc/token.cpp
parent7f52cac95b1e83cb9f5d9a9952c001688ea5bb8a (diff)
parentdc57f977ed8334530ef0da7e585eec7daef304eb (diff)
downloadQt-9ff0ba6375695d777ee268ae6682189d9245fbef.zip
Qt-9ff0ba6375695d777ee268ae6682189d9245fbef.tar.gz
Qt-9ff0ba6375695d777ee268ae6682189d9245fbef.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix PM_TabBarScrollButtonWidth pixel metric in Windows mobile style Stabilize taskQTBUG_7863_paintIntoCacheWithTransparentParts auto-test. Optimize getting bearings of a glyph on Windows for true type fonts Fixes blending problem when paiting non-opaque items with cache enabled. Optimize speed of QTextLayout and QPainter::drawText Fix a crash in animation groups when deleting uncontrolled animations
Diffstat (limited to 'src/tools/moc/token.cpp')
0 files changed, 0 insertions, 0 deletions