summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-17 09:13:15 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-17 09:13:15 (GMT)
commit0adaa5fd48b39b83e2e2b7693cbc2452e2076c15 (patch)
tree14e299e9f671e23b9e130bd70452aaed6125e5a5 /src/gui/kernel
parent75edecadeeddb069711c28ff89834ea899bb2757 (diff)
parent8af2f7b5085ee56d289584bddbccc8dead04b9d1 (diff)
downloadQt-0adaa5fd48b39b83e2e2b7693cbc2452e2076c15.zip
Qt-0adaa5fd48b39b83e2e2b7693cbc2452e2076c15.tar.gz
Qt-0adaa5fd48b39b83e2e2b7693cbc2452e2076c15.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 possible crash in QTextLayout for glyphless items
Diffstat (limited to 'src/gui/kernel')
0 files changed, 0 insertions, 0 deletions