summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-28 16:28:08 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-28 16:28:08 (GMT)
commit4074b7ff641bfc252b691d9c8bf8ae97edda4d81 (patch)
tree1a30bd66eafcdcf2fc819057efff228dde0d1fb2 /src/gui/text
parentc5cd6161a8b9e03eea58314806a67f7390ed0d6a (diff)
parentc9c54682bcd23598ac7a8db3b10e9f18c978e268 (diff)
downloadQt-4074b7ff641bfc252b691d9c8bf8ae97edda4d81.zip
Qt-4074b7ff641bfc252b691d9c8bf8ae97edda4d81.tar.gz
Qt-4074b7ff641bfc252b691d9c8bf8ae97edda4d81.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 in raster on X11 when text contains unsupported characters
Diffstat (limited to 'src/gui/text')
0 files changed, 0 insertions, 0 deletions