Changeset 561 for trunk/include/QtMultimedia

Timestamp:

Feb 11, 2010, 11:19:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• include/QtMultimedia (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia )
• include/QtMultimedia/QAbstractAudioDeviceInfo (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAbstractAudioDeviceInfo )
• include/QtMultimedia/QAbstractAudioInput (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAbstractAudioInput )
• include/QtMultimedia/QAbstractAudioOutput (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAbstractAudioOutput )
• include/QtMultimedia/QAbstractVideoBuffer (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAbstractVideoBuffer )
• include/QtMultimedia/QAbstractVideoSurface (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAbstractVideoSurface )
• include/QtMultimedia/QAudioDeviceInfo (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAudioDeviceInfo )
• include/QtMultimedia/QAudioEngineFactoryInterface (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAudioEngineFactoryInterface )
• include/QtMultimedia/QAudioEnginePlugin (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAudioEnginePlugin )
• include/QtMultimedia/QAudioFormat (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAudioFormat )
• include/QtMultimedia/QAudioInput (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAudioInput )
• include/QtMultimedia/QAudioOutput (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QAudioOutput )
• include/QtMultimedia/QVideoFrame (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QVideoFrame )
• include/QtMultimedia/QVideoSurfaceFormat (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QVideoSurfaceFormat )
• include/QtMultimedia/QtMultimedia (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/QtMultimedia )
• include/QtMultimedia/headers.pri (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/headers.pri )
• include/QtMultimedia/private (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private )
• include/QtMultimedia/private/qabstractvideobuffer_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qabstractvideobuffer_p.h )
• include/QtMultimedia/private/qabstractvideosurface_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qabstractvideosurface_p.h )
• include/QtMultimedia/private/qaudio_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudio_mac_p.h )
• include/QtMultimedia/private/qaudiodevicefactory_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudiodevicefactory_p.h )
• include/QtMultimedia/private/qaudiodeviceinfo_alsa_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudiodeviceinfo_alsa_p.h )
• include/QtMultimedia/private/qaudiodeviceinfo_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudiodeviceinfo_mac_p.h )
• include/QtMultimedia/private/qaudiodeviceinfo_win32_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudiodeviceinfo_win32_p.h )
• include/QtMultimedia/private/qaudioinput_alsa_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudioinput_alsa_p.h )
• include/QtMultimedia/private/qaudioinput_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudioinput_mac_p.h )
• include/QtMultimedia/private/qaudioinput_win32_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudioinput_win32_p.h )
• include/QtMultimedia/private/qaudiooutput_alsa_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudiooutput_alsa_p.h )
• include/QtMultimedia/private/qaudiooutput_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudiooutput_mac_p.h )
• include/QtMultimedia/private/qaudiooutput_win32_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qaudiooutput_win32_p.h )
• include/QtMultimedia/private/qimagevideobuffer_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qimagevideobuffer_p.h )
• include/QtMultimedia/private/qmemoryvideobuffer_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/private/qmemoryvideobuffer_p.h )
• include/QtMultimedia/qabstractvideobuffer.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qabstractvideobuffer.h )
• include/QtMultimedia/qabstractvideosurface.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qabstractvideosurface.h )
• include/QtMultimedia/qaudio.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qaudio.h )
• include/QtMultimedia/qaudiodeviceinfo.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qaudiodeviceinfo.h )
• include/QtMultimedia/qaudioengine.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qaudioengine.h )
• include/QtMultimedia/qaudioengineplugin.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qaudioengineplugin.h )
• include/QtMultimedia/qaudioformat.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qaudioformat.h )
• include/QtMultimedia/qaudioinput.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qaudioinput.h )
• include/QtMultimedia/qaudiooutput.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qaudiooutput.h )
• include/QtMultimedia/qvideoframe.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qvideoframe.h )
• include/QtMultimedia/qvideosurfaceformat.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/include/QtMultimedia/qvideosurfaceformat.h )