diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-14 17:42:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-14 17:42:13 (GMT) |
| commit | f37db56dda632d4a7e2e0301756331697f72b65a (patch) | |
| tree | f78b189d8c1b3414ad4da383681b6b0062b1cc37 /mkspecs/irix-cc | |
| parent | 0b90bb86d2ef0b925158a9cf185981eaea1776c2 (diff) | |
| parent | a5df9f7e42d4d940e47f56d522b370b4876fa622 (diff) | |
| download | Qt-f37db56dda632d4a7e2e0301756331697f72b65a.zip Qt-f37db56dda632d4a7e2e0301756331697f72b65a.tar.gz Qt-f37db56dda632d4a7e2e0301756331697f72b65a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Remove font that may not exists in some OS X systems
Fix regression in styleName searching
Fix styleName listing with the same QtFontStyle::Key value
Fix localized font family access in OS X
Diffstat (limited to 'mkspecs/irix-cc')
0 files changed, 0 insertions, 0 deletions