diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-10 17:34:44 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-10 17:34:44 (GMT) |
commit | c87479a37db0af3016284711c5745e38177af1c4 (patch) | |
tree | e1a8b740fac806b22783e3ce0ecb0034ddc3ef72 /src/gui | |
parent | 8b05e2626de4d5a2dcc989c1521d387767f62388 (diff) | |
parent | cedb5e0a5bb381ecfe5acc463d96a0c15abe474d (diff) | |
download | Qt-c87479a37db0af3016284711c5745e38177af1c4.zip Qt-c87479a37db0af3016284711c5745e38177af1c4.tar.gz Qt-c87479a37db0af3016284711c5745e38177af1c4.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:
Missing glyphs in GL when scaling QStaticText and QML text items
Diffstat (limited to 'src/gui')
0 files changed, 0 insertions, 0 deletions