diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 22:59:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 22:59:44 (GMT) |
| commit | 8a026d93a76a61415b4d697991cdd8aee6b76cb9 (patch) | |
| tree | 1bc239f7a6c5a6c629b2a202cb67eefe5ea3cdb9 /src/gui/text/qfont_mac.cpp | |
| parent | 8bc0456491e5a7e1fc677fce6e76932ab0d923e8 (diff) | |
| parent | 34329f2f7b535cb0904279203ac1c06efb958651 (diff) | |
| download | Qt-8a026d93a76a61415b4d697991cdd8aee6b76cb9.zip Qt-8a026d93a76a61415b4d697991cdd8aee6b76cb9.tar.gz Qt-8a026d93a76a61415b4d697991cdd8aee6b76cb9.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:
QScript: Fix crash when converting a null value to a variant.
QPrinter: Add Current Page print range support
Fix build when egl.h includes X11 headers & pollutes namespace
Fix build on EGL implementations where EGLConfig is a pointer
Delay the resize section for better performance.
Diffstat (limited to 'src/gui/text/qfont_mac.cpp')
0 files changed, 0 insertions, 0 deletions