diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-15 01:44:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-15 01:44:26 (GMT) |
| commit | 0540bd988196dd7f34b755f401927080e8503136 (patch) | |
| tree | d8e07a0788ff872375cf3cccb847a7b45a9466fd /examples/declarative/connections/content/bg1.jpg | |
| parent | 01e03e91a0c6867205f5a3ab0306f0c6a067ffad (diff) | |
| parent | 036c0b1d9189cf5744662737ecb8a044c2bda80b (diff) | |
| download | Qt-0540bd988196dd7f34b755f401927080e8503136.zip Qt-0540bd988196dd7f34b755f401927080e8503136.tar.gz Qt-0540bd988196dd7f34b755f401927080e8503136.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Optimize QPixmapIconEngine's pixmap() function"
Limit the lower glyph texture cache size to 16x16 in GL.
Added workarounds for two MBX/SGX specific GL ES bugs/problems.
Add missing file!
Optimize QPixmapIconEngine's pixmap() function
Diffstat (limited to 'examples/declarative/connections/content/bg1.jpg')
0 files changed, 0 insertions, 0 deletions