diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-14 13:00:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-14 13:00:09 (GMT) |
| commit | 84066a357e868b7d3f774f4847840014d3bf9e51 (patch) | |
| tree | 9881854147d2587ca5625d18d533cc4d4118e1d5 /src/gui | |
| parent | 42894568b699cc72a7363381d2a0a49539a6beb3 (diff) | |
| parent | 919c5a0e4b15b993d438dd137b17d4710228c595 (diff) | |
| download | Qt-84066a357e868b7d3f774f4847840014d3bf9e51.zip Qt-84066a357e868b7d3f774f4847840014d3bf9e51.tar.gz Qt-84066a357e868b7d3f774f4847840014d3bf9e51.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Skip sub pixel positions test if font smoothing is off
Q_MAC_USE_COCOA -> QT_MAC_USE_COCOA
Diffstat (limited to 'src/gui')
0 files changed, 0 insertions, 0 deletions