diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 13:20:55 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 13:20:55 +1000 |
| commit | 4631d297781b8ad4eba0735b7023265d4872c1cb (patch) | |
| tree | ecd86d0096081fc1a71c6a0cfa4878f97b447100 /src/gui/text/qfontengine_mac.mm | |
| parent | 8062464ce3f5fd6eb92f94d1fafa697385de72ce (diff) | |
| parent | c3d2d583121219836714609b250e4e52e33e393d (diff) | |
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:
fixed CI gate flagged spelling error: occured -> occurred
file rename
various fixes to deal with CI gate failures
Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
QNetworkProxyFactory::systemProxyForQuery() for Symbian
Diffstat (limited to 'src/gui/text/qfontengine_mac.mm')
0 files changed, 0 insertions, 0 deletions