diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 17:47:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 17:47:40 (GMT) |
| commit | 364ecfa36d6d4dc0aa917a223e88869028d8219c (patch) | |
| tree | 5bcb9a3504340c11213132897a4e59f6384704b9 /src/gui/kernel | |
| parent | 5067683704580fcfedef4e68f19acedb133936e8 (diff) | |
| parent | 3bc1dc6d3d609166af0532b9f75734aee232cded (diff) | |
| download | Qt-364ecfa36d6d4dc0aa917a223e88869028d8219c.zip Qt-364ecfa36d6d4dc0aa917a223e88869028d8219c.tar.gz Qt-364ecfa36d6d4dc0aa917a223e88869028d8219c.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Placate pedantic compiler warning modes on QGLBuffer
Promote QPixmap::convertFromImage() to public API from Qt3Support
Add the QGLBuffer class to Qt 4.7 for VBO's
Diffstat (limited to 'src/gui/kernel')
0 files changed, 0 insertions, 0 deletions