diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-23 23:13:51 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-23 23:13:51 +1000 |
| commit | 164728f711136356a6c3482f762321b01c9d82dd (patch) | |
| tree | ef76a64523ff99b1160eb7c8885a0d84c810f735 /src/gui/text/qfontengine_s60.cpp | |
| parent | dfcaa6b67c1df879b08dd6952a7cfd60d93ff543 (diff) | |
| parent | 59bd3bcd961fb3198dc9ba24996f7f9af67aeda3 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add a function that returns the D-Bus local machine ID
Add an SSE4.2 even simpler version of toLatin1
Diffstat (limited to 'src/gui/text/qfontengine_s60.cpp')
0 files changed, 0 insertions, 0 deletions