diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 13:30:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-08 13:30:42 (GMT) |
| commit | 86354a3896b92b110e5d28cbf894c23ed837f11e (patch) | |
| tree | d38a6f0a18082419424d271328c1f409d292a68b /src/opengl/qgl_x11egl.cpp | |
| parent | 0f3fd01523081656c27ebb7b495c4f1a1c927117 (diff) | |
| parent | aa5df3c136a5c01d505d3005790907e1bccc4e26 (diff) | |
| download | Qt-86354a3896b92b110e5d28cbf894c23ed837f11e.zip Qt-86354a3896b92b110e5d28cbf894c23ed837f11e.tar.gz Qt-86354a3896b92b110e5d28cbf894c23ed837f11e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove duration property from QSoundEffect.
Fix effects.pri.
Refactor QSoundEffect.
Diffstat (limited to 'src/opengl/qgl_x11egl.cpp')
0 files changed, 0 insertions, 0 deletions