diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-14 16:45:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-14 16:45:19 (GMT) |
| commit | 10fb4f1fe7750bb48be015169c827cb585e19196 (patch) | |
| tree | 41ac4dab12d6f2f32c8c331e0bf5830f492b479e /src/gui/text/qfontengine_x11_p.h | |
| parent | eb6d5d51a932ab61d094e8de5c119d75380c788a (diff) | |
| parent | 0f860c39622996f7de67f19d9913dafd57cc8031 (diff) | |
| download | Qt-10fb4f1fe7750bb48be015169c827cb585e19196.zip Qt-10fb4f1fe7750bb48be015169c827cb585e19196.tar.gz Qt-10fb4f1fe7750bb48be015169c827cb585e19196.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:
Revert "Fix compilation of lrelease on Windows"
Fix compilation of lrelease on Windows
Allow selecting fonts with irregular style names
Fix missing empty lines in Qt HTML when displayed in compliant browsers
Protect against deleted windows
Diffstat (limited to 'src/gui/text/qfontengine_x11_p.h')
0 files changed, 0 insertions, 0 deletions