diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-05 15:45:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-05 15:45:30 (GMT) |
| commit | d4bed7dac60406fb98cc6c2b67689db153a56abf (patch) | |
| tree | a5f562877aa4ef68e13fca14149d78b93fb9261a /src/gui/text/qfont_x11.cpp | |
| parent | a67882cd976830bcd955a66ee06aadec97f4e53a (diff) | |
| parent | 0ea104433855c65866f583f9f7d347b17679df33 (diff) | |
| download | Qt-d4bed7dac60406fb98cc6c2b67689db153a56abf.zip Qt-d4bed7dac60406fb98cc6c2b67689db153a56abf.tar.gz Qt-d4bed7dac60406fb98cc6c2b67689db153a56abf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Set the registration time while using the collection generator to register.
Network: Optimize HTTP proxy lookup on Windows
qdoc: Added explanation of autmatically generated signal hanlers.
QSslSocket::systemCaCertificates(): fix for WinCE
Doc: fixing search script and style
qdoc: Fixed type linking for QML properties (most of them).
Diffstat (limited to 'src/gui/text/qfont_x11.cpp')
0 files changed, 0 insertions, 0 deletions