diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 11:05:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 11:05:34 (GMT) |
| commit | ae305abfdb795b472b2b9d200bf3b11af00d7d1f (patch) | |
| tree | 08880619796fcceef8d0441701986a5504203196 /src/opengl/qglbuffer.cpp | |
| parent | 3ac354b885dcaf7186cf8bafdfc2bdc0c6d8dbd0 (diff) | |
| parent | 8c4f8e259d60c98361d20f495e3af252bcef24a0 (diff) | |
| download | Qt-ae305abfdb795b472b2b9d200bf3b11af00d7d1f.zip Qt-ae305abfdb795b472b2b9d200bf3b11af00d7d1f.tar.gz Qt-ae305abfdb795b472b2b9d200bf3b11af00d7d1f.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: (22 commits)
Fix typo in phonon/symbian.
Fixed compilation on 64 bits Mac OS 10.5
Remove debug code disabling the video widget output control.
Force a repaint on changes in the native size of video frames.
Don't fill the video widget borders or background by default.
Fix compile.
QuickTime video widget: use widget palette for video background color.
Update PulseAudio config.test.
Fix strange typo? in Phonon/ds9.pro.
Change availabilty of camera related code.
QuickTime media backend: ensure quicktime notification are
QuickTime backend: disable video outputs in stopped state.
Remove references to evr based renderer from .pro.
QuickTime media backend: Render CIImage based video frames directly with
Phonon core; compile fixes after merge.
Phonon qt7; Compile fixes after merge.
Phonon; complete integration.
Update Phonon CMakeLists.txt.
Update Phonon qt7 backend to 4.4.0.
Update Phonon ds9 backend to 4.4.0.
...
Diffstat (limited to 'src/opengl/qglbuffer.cpp')
0 files changed, 0 insertions, 0 deletions