diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 02:55:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 02:55:25 (GMT) |
| commit | aee4087d62900624822ea820b1eb8e2d960d0869 (patch) | |
| tree | 45575eca8d255e519562ab0279d9582736dee7a2 /src/opengl/qpixmapdata_poolgl.cpp | |
| parent | 09ecb50448bc3255c80764dbc267bb6a77195287 (diff) | |
| parent | bfc04b22d3f80f43787e86ee4cc6a39436fa039c (diff) | |
| download | Qt-aee4087d62900624822ea820b1eb8e2d960d0869.zip Qt-aee4087d62900624822ea820b1eb8e2d960d0869.tar.gz Qt-aee4087d62900624822ea820b1eb8e2d960d0869.tar.bz2 | |
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:
tst_qlocale: improve failure message in tst_QLocale::macDefaultLocale
Add a once-over unrolled fromLatin1 conversion (32 characters)
Add 16-byte loads of the Neon fromLatin1 functions
Fix warning about unused parameter
Diffstat (limited to 'src/opengl/qpixmapdata_poolgl.cpp')
0 files changed, 0 insertions, 0 deletions