Changeset 769 for trunk/include/QtMultimedia

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• include/QtMultimedia/QAudio (copied) (copied from branches/vendor/nokia/qt/4.6.3/include/QtMultimedia/QAudio )
• include/QtMultimedia/headers.pri (modified) (1 diff)
• include/QtMultimedia/private/qaudio_symbian_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/include/QtMultimedia/private/qaudio_symbian_p.h )
• include/QtMultimedia/private/qaudiodeviceinfo_symbian_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/include/QtMultimedia/private/qaudiodeviceinfo_symbian_p.h )
• include/QtMultimedia/private/qaudioinput_symbian_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/include/QtMultimedia/private/qaudioinput_symbian_p.h )
• include/QtMultimedia/private/qaudiooutput_symbian_p.h (copied) (copied from branches/vendor/nokia/qt/4.6.3/include/QtMultimedia/private/qaudiooutput_symbian_p.h )

trunk/include/QtMultimedia/headers.pri

@@ -1 +1 @@
 SYNCQT.HEADER_FILES = ../multimedia/audio/qaudio.h ../multimedia/audio/qaudiodeviceinfo.h ../multimedia/audio/qaudioengine.h ../multimedia/audio/qaudioengineplugin.h ../multimedia/audio/qaudioformat.h ../multimedia/audio/qaudioinput.h ../multimedia/audio/qaudiooutput.h ../multimedia/video/qabstractvideobuffer.h ../multimedia/video/qabstractvideosurface.h ../multimedia/video/qvideoframe.h ../multimedia/video/qvideosurfaceformat.h ../../include/QtMultimedia/QtMultimedia 
-SYNCQT.HEADER_CLASSES = ../../include/QtMultimedia/QAudioDeviceInfo ../../include/QtMultimedia/QAbstractAudioDeviceInfo ../../include/QtMultimedia/QAbstractAudioOutput ../../include/QtMultimedia/QAbstractAudioInput ../../include/QtMultimedia/QAudioEngineFactoryInterface ../../include/QtMultimedia/QAudioEnginePlugin ../../include/QtMultimedia/QAudioFormat ../../include/QtMultimedia/QAudioInput ../../include/QtMultimedia/QAudioOutput ../../include/QtMultimedia/QAbstractVideoBuffer ../../include/QtMultimedia/QAbstractVideoSurface ../../include/QtMultimedia/QVideoFrame ../../include/QtMultimedia/QVideoSurfaceFormat 
-SYNCQT.PRIVATE_HEADER_FILES = ../multimedia/audio/qaudio_mac_p.h ../multimedia/audio/qaudiodevicefactory_p.h ../multimedia/audio/qaudiodeviceinfo_alsa_p.h ../multimedia/audio/qaudiodeviceinfo_mac_p.h ../multimedia/audio/qaudiodeviceinfo_win32_p.h ../multimedia/audio/qaudioinput_alsa_p.h ../multimedia/audio/qaudioinput_mac_p.h ../multimedia/audio/qaudioinput_win32_p.h ../multimedia/audio/qaudiooutput_alsa_p.h ../multimedia/audio/qaudiooutput_mac_p.h ../multimedia/audio/qaudiooutput_win32_p.h ../multimedia/video/qabstractvideobuffer_p.h ../multimedia/video/qabstractvideosurface_p.h ../multimedia/video/qimagevideobuffer_p.h ../multimedia/video/qmemoryvideobuffer_p.h 
+SYNCQT.HEADER_CLASSES = ../../include/QtMultimedia/QAudioDeviceInfo ../../include/QtMultimedia/QAbstractAudioDeviceInfo ../../include/QtMultimedia/QAbstractAudioOutput ../../include/QtMultimedia/QAbstractAudioInput ../../include/QtMultimedia/QAudioEngineFactoryInterface ../../include/QtMultimedia/QAudioEnginePlugin ../../include/QtMultimedia/QAudioFormat ../../include/QtMultimedia/QAudioInput ../../include/QtMultimedia/QAudioOutput ../../include/QtMultimedia/QAbstractVideoBuffer ../../include/QtMultimedia/QAbstractVideoSurface ../../include/QtMultimedia/QVideoFrame ../../include/QtMultimedia/QVideoSurfaceFormat 
+SYNCQT.PRIVATE_HEADER_FILES = ../multimedia/audio/qaudio_mac_p.h ../multimedia/audio/qaudio_p.h ../multimedia/audio/qaudiooutput_win32_p.h ../multimedia/video/qabstractvideobuffer_p.h ../multimedia/video/qabstractvideosurface_p.h ../multimedia/video/qimagevideobuffer_p.h ../multimedia/video/qmemoryvideobuffer_p.h