Changeset 561 for trunk/src/multimedia

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)
• src/multimedia (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia )
• src/multimedia/audio (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio )
• src/multimedia/audio/audio.pri (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/audio.pri )
• src/multimedia/audio/qaudio.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudio.cpp )
• src/multimedia/audio/qaudio.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudio.h )
• src/multimedia/audio/qaudio_mac.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudio_mac.cpp )
• src/multimedia/audio/qaudio_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudio_mac_p.h )
• src/multimedia/audio/qaudiodevicefactory.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodevicefactory.cpp )
• src/multimedia/audio/qaudiodevicefactory_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodevicefactory_p.h )
• src/multimedia/audio/qaudiodeviceinfo.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodeviceinfo.cpp )
• src/multimedia/audio/qaudiodeviceinfo.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodeviceinfo.h )
• src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp )
• src/multimedia/audio/qaudiodeviceinfo_alsa_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h )
• src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp )
• src/multimedia/audio/qaudiodeviceinfo_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodeviceinfo_mac_p.h )
• src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp )
• src/multimedia/audio/qaudiodeviceinfo_win32_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiodeviceinfo_win32_p.h )
• src/multimedia/audio/qaudioengine.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioengine.cpp )
• src/multimedia/audio/qaudioengine.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioengine.h )
• src/multimedia/audio/qaudioengineplugin.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioengineplugin.cpp )
• src/multimedia/audio/qaudioengineplugin.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioengineplugin.h )
• src/multimedia/audio/qaudioformat.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioformat.cpp )
• src/multimedia/audio/qaudioformat.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioformat.h )
• src/multimedia/audio/qaudioinput.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioinput.cpp )
• src/multimedia/audio/qaudioinput.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioinput.h )
• src/multimedia/audio/qaudioinput_alsa_p.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioinput_alsa_p.cpp )
• src/multimedia/audio/qaudioinput_alsa_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioinput_alsa_p.h )
• src/multimedia/audio/qaudioinput_mac_p.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioinput_mac_p.cpp )
• src/multimedia/audio/qaudioinput_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioinput_mac_p.h )
• src/multimedia/audio/qaudioinput_win32_p.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioinput_win32_p.cpp )
• src/multimedia/audio/qaudioinput_win32_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudioinput_win32_p.h )
• src/multimedia/audio/qaudiooutput.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiooutput.cpp )
• src/multimedia/audio/qaudiooutput.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiooutput.h )
• src/multimedia/audio/qaudiooutput_alsa_p.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiooutput_alsa_p.cpp )
• src/multimedia/audio/qaudiooutput_alsa_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiooutput_alsa_p.h )
• src/multimedia/audio/qaudiooutput_mac_p.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiooutput_mac_p.cpp )
• src/multimedia/audio/qaudiooutput_mac_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiooutput_mac_p.h )
• src/multimedia/audio/qaudiooutput_win32_p.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiooutput_win32_p.cpp )
• src/multimedia/audio/qaudiooutput_win32_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/audio/qaudiooutput_win32_p.h )
• src/multimedia/multimedia.pro (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/multimedia.pro )
• src/multimedia/video (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video )
• src/multimedia/video/qabstractvideobuffer.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qabstractvideobuffer.cpp )
• src/multimedia/video/qabstractvideobuffer.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qabstractvideobuffer.h )
• src/multimedia/video/qabstractvideobuffer_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qabstractvideobuffer_p.h )
• src/multimedia/video/qabstractvideosurface.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qabstractvideosurface.cpp )
• src/multimedia/video/qabstractvideosurface.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qabstractvideosurface.h )
• src/multimedia/video/qabstractvideosurface_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qabstractvideosurface_p.h )
• src/multimedia/video/qimagevideobuffer.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qimagevideobuffer.cpp )
• src/multimedia/video/qimagevideobuffer_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qimagevideobuffer_p.h )
• src/multimedia/video/qmemoryvideobuffer.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qmemoryvideobuffer.cpp )
• src/multimedia/video/qmemoryvideobuffer_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qmemoryvideobuffer_p.h )
• src/multimedia/video/qvideoframe.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qvideoframe.cpp )
• src/multimedia/video/qvideoframe.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qvideoframe.h )
• src/multimedia/video/qvideosurfaceformat.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qvideosurfaceformat.cpp )
• src/multimedia/video/qvideosurfaceformat.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/qvideosurfaceformat.h )
• src/multimedia/video/video.pri (copied) (copied from branches/vendor/nokia/qt/4.6.1/src/multimedia/video/video.pri )