diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 03:37:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-30 03:37:59 (GMT) |
| commit | 4832f2e0e933794787aa95cbe4c2ae171cad1cf9 (patch) | |
| tree | 371cdb936ca9d9c86da4b3e157984dbfdaace89c /doc/src/snippets/sqldatabase/sqldatabase.pro | |
| parent | c4f59859a589b76419e9133110eda850223f03dd (diff) | |
| parent | d123f41136914e2622af1680dbe3201dabd9823e (diff) | |
| download | Qt-4832f2e0e933794787aa95cbe4c2ae171cad1cf9.zip Qt-4832f2e0e933794787aa95cbe4c2ae171cad1cf9.tar.gz Qt-4832f2e0e933794787aa95cbe4c2ae171cad1cf9.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: (21 commits)
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.
Update Phonon GStreamer backend to 4.4.0.
...
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions