diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 08:02:45 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 08:02:45 +0200 |
| commit | 7b10151cb6550fe8060217fad8549950eadd5fca (patch) | |
| tree | 96a450a91f083ba3024ebc6eb85bae466b3c62d7 /src/gui/text/qtextlayout.cpp | |
| parent | 104e9d2b3f8ac981a277cb0d63a1e5be8e352275 (diff) | |
| parent | 289f9a97c3828135bdc2fd6b3e8466c1c970a5c5 (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:
Cherry pick fix for MOBILITY-1234 from Qt Mobility.
Cherry pick fix for QTMOBILITY-408 from Qt Mobility.
Cherry pick fix for MOBILITY-1194 from Qt Mobility.
Fix compilation error on Symbian^4.
Fix detection of OCC functionality.
Cherry pick fix for MOBILITY-1194 from Qt Mobility.
Diffstat (limited to 'src/gui/text/qtextlayout.cpp')
0 files changed, 0 insertions, 0 deletions