summaryrefslogtreecommitdiffstats
path: root/src/gui/text/text.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-17 02:03:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-17 02:03:53 (GMT)
commitdc5543f5595870209e8122d13d070694b5e0eb39 (patch)
tree09fe74aa408e9d2fc9198df71dc032e0680fe4b7 /src/gui/text/text.pri
parent30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff)
parent0842309e6e04d34c027374d0793dc60d3ec6e28b (diff)
downloadQt-dc5543f5595870209e8122d13d070694b5e0eb39.zip
Qt-dc5543f5595870209e8122d13d070694b5e0eb39.tar.gz
Qt-dc5543f5595870209e8122d13d070694b5e0eb39.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix crash on Mac OS X when drawing text with Qt::TextBypassShaping set Fixed infinite recursion when drawing very large painter paths. Fixed full-rule on clipped painter paths. Removed unnecessary lines of code. Fixed problem with wrong size hints when items were removed.
Diffstat (limited to 'src/gui/text/text.pri')
0 files changed, 0 insertions, 0 deletions