Changeset 561 for trunk/include/phonon


Ignore:
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:
2 edited
44 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/include/phonon/headers.pri

    r560 r561  
    11SYNCQT.HEADER_FILES = ../phonon/../3rdparty/phonon/phonon/abstractaudiooutput.h ../phonon/../3rdparty/phonon/phonon/abstractmediastream.h ../phonon/../3rdparty/phonon/phonon/abstractvideooutput.h ../phonon/../3rdparty/phonon/phonon/addoninterface.h ../phonon/../3rdparty/phonon/phonon/audiooutput.h ../phonon/../3rdparty/phonon/phonon/audiooutputinterface.h ../phonon/../3rdparty/phonon/phonon/backendcapabilities.h ../phonon/../3rdparty/phonon/phonon/backendinterface.h ../phonon/../3rdparty/phonon/phonon/effect.h ../phonon/../3rdparty/phonon/phonon/effectinterface.h ../phonon/../3rdparty/phonon/phonon/effectparameter.h ../phonon/../3rdparty/phonon/phonon/effectwidget.h ../phonon/../3rdparty/phonon/phonon/mediacontroller.h ../phonon/../3rdparty/phonon/phonon/medianode.h ../phonon/../3rdparty/phonon/phonon/mediaobject.h ../phonon/../3rdparty/phonon/phonon/mediaobjectinterface.h ../phonon/../3rdparty/phonon/phonon/mediasource.h ../phonon/../3rdparty/phonon/phonon/objectdescription.h ../phonon/../3rdparty/phonon/phonon/objectdescriptionmodel.h ../phonon/../3rdparty/phonon/phonon/path.h ../phonon/../3rdparty/phonon/phonon/phonon_export.h ../phonon/../3rdparty/phonon/phonon/phonondefs.h ../phonon/../3rdparty/phonon/phonon/phononnamespace.h ../phonon/../3rdparty/phonon/phonon/platformplugin.h ../phonon/../3rdparty/phonon/phonon/seekslider.h ../phonon/../3rdparty/phonon/phonon/streaminterface.h ../phonon/../3rdparty/phonon/phonon/videoplayer.h ../phonon/../3rdparty/phonon/phonon/videowidget.h ../phonon/../3rdparty/phonon/phonon/videowidgetinterface.h ../phonon/../3rdparty/phonon/phonon/volumefadereffect.h ../phonon/../3rdparty/phonon/phonon/volumefaderinterface.h ../phonon/../3rdparty/phonon/phonon/volumeslider.h ../../include/phonon/phonon
    2 SYNCQT.HEADER_CLASSES = ../../include/phonon/../Phonon/AbstractAudioOutput ../../include/phonon/../Phonon/AbstractMediaStream ../../include/phonon/../Phonon/AbstractVideoOutput ../../include/phonon/../Phonon/AddonInterface ../../include/phonon/../Phonon/AudioOutput ../../include/phonon/../Phonon/AudioOutputInterface40 ../../include/phonon/../Phonon/AudioOutputInterface42 ../../include/phonon/../Phonon/AudioOutputInterface ../../include/phonon/../Phonon/BackendCapabilities ../../include/phonon/../Phonon/BackendInterface ../../include/phonon/../Phonon/Effect ../../include/phonon/../Phonon/EffectInterface ../../include/phonon/../Phonon/EffectParameter ../../include/phonon/../Phonon/EffectWidget ../../include/phonon/../Phonon/MediaController ../../include/phonon/../Phonon/MediaNode ../../include/phonon/../Phonon/MediaObject ../../include/phonon/../Phonon/MediaObjectInterface ../../include/phonon/../Phonon/MediaSource ../../include/phonon/../Phonon/ObjectDescriptionData ../../include/phonon/../Phonon/ObjectDescription ../../include/phonon/../Phonon/AudioOutputDevice ../../include/phonon/../Phonon/AudioCaptureDevice ../../include/phonon/../Phonon/EffectDescription ../../include/phonon/../Phonon/AudioChannelDescription ../../include/phonon/../Phonon/SubtitleDescription ../../include/phonon/../Phonon/ObjectDescriptionModelData ../../include/phonon/../Phonon/ObjectDescriptionModel ../../include/phonon/../Phonon/AudioOutputDeviceModel ../../include/phonon/../Phonon/AudioCaptureDeviceModel ../../include/phonon/../Phonon/EffectDescriptionModel ../../include/phonon/../Phonon/AudioChannelDescriptionModel ../../include/phonon/../Phonon/SubtitleDescriptionModel ../../include/phonon/../Phonon/Path ../../include/phonon/../Phonon/PlatformPlugin ../../include/phonon/../Phonon/SeekSlider ../../include/phonon/../Phonon/StreamInterface ../../include/phonon/../Phonon/VideoPlayer ../../include/phonon/../Phonon/VideoWidget ../../include/phonon/../Phonon/VideoWidgetInterface ../../include/phonon/../Phonon/VolumeFaderEffect ../../include/phonon/../Phonon/VolumeFaderInterface ../../include/phonon/../Phonon/VolumeSlider
     2SYNCQT.HEADER_CLASSES = ../../include/phonon/AbstractAudioOutput ../../include/phonon/AbstractMediaStream ../../include/phonon/AbstractVideoOutput ../../include/phonon/AddonInterface ../../include/phonon/AudioOutput ../../include/phonon/AudioOutputInterface40 ../../include/phonon/AudioOutputInterface42 ../../include/phonon/AudioOutputInterface ../../include/phonon/BackendCapabilities ../../include/phonon/BackendInterface ../../include/phonon/Effect ../../include/phonon/EffectInterface ../../include/phonon/EffectParameter ../../include/phonon/EffectWidget ../../include/phonon/MediaController ../../include/phonon/MediaNode ../../include/phonon/MediaObject ../../include/phonon/MediaObjectInterface ../../include/phonon/MediaSource ../../include/phonon/ObjectDescriptionData ../../include/phonon/ObjectDescription ../../include/phonon/AudioOutputDevice ../../include/phonon/AudioCaptureDevice ../../include/phonon/EffectDescription ../../include/phonon/AudioChannelDescription ../../include/phonon/SubtitleDescription ../../include/phonon/ObjectDescriptionModelData ../../include/phonon/ObjectDescriptionModel ../../include/phonon/AudioOutputDeviceModel ../../include/phonon/AudioCaptureDeviceModel ../../include/phonon/EffectDescriptionModel ../../include/phonon/AudioChannelDescriptionModel ../../include/phonon/SubtitleDescriptionModel ../../include/phonon/Path ../../include/phonon/Global ../../include/phonon/PlatformPlugin ../../include/phonon/SeekSlider ../../include/phonon/StreamInterface ../../include/phonon/VideoPlayer ../../include/phonon/VideoWidget ../../include/phonon/VideoWidgetInterface ../../include/phonon/VolumeFaderEffect ../../include/phonon/VolumeFaderInterface ../../include/phonon/VolumeSlider
     3SYNCQT.PRIVATE_HEADER_FILES = ../phonon/../3rdparty/phonon/phonon/abstractaudiooutput_p.h ../phonon/../3rdparty/phonon/phonon/abstractmediastream_p.h ../phonon/../3rdparty/phonon/phonon/abstractvideooutput_p.h ../phonon/../3rdparty/phonon/phonon/audiooutput_p.h ../phonon/../3rdparty/phonon/phonon/audiooutputadaptor_p.h ../phonon/../3rdparty/phonon/phonon/backendcapabilities_p.h ../phonon/../3rdparty/phonon/phonon/effect_p.h ../phonon/../3rdparty/phonon/phonon/effectparameter_p.h ../phonon/../3rdparty/phonon/phonon/effectwidget_p.h ../phonon/../3rdparty/phonon/phonon/factory_p.h ../phonon/../3rdparty/phonon/phonon/frontendinterface_p.h ../phonon/../3rdparty/phonon/phonon/globalconfig_p.h ../phonon/../3rdparty/phonon/phonon/globalstatic_p.h ../phonon/../3rdparty/phonon/phonon/iodevicestream_p.h ../phonon/../3rdparty/phonon/phonon/medianode_p.h ../phonon/../3rdparty/phonon/phonon/medianodedestructionhandler_p.h ../phonon/../3rdparty/phonon/phonon/mediaobject_p.h ../phonon/../3rdparty/phonon/phonon/mediasource_p.h ../phonon/../3rdparty/phonon/phonon/objectdescription_p.h ../phonon/../3rdparty/phonon/phonon/objectdescriptionmodel_p.h ../phonon/../3rdparty/phonon/phonon/path_p.h ../phonon/../3rdparty/phonon/phonon/phonondefs_p.h ../phonon/../3rdparty/phonon/phonon/phononnamespace_p.h ../phonon/../3rdparty/phonon/phonon/platform_p.h ../phonon/../3rdparty/phonon/phonon/qsettingsgroup_p.h ../phonon/../3rdparty/phonon/phonon/seekslider_p.h ../phonon/../3rdparty/phonon/phonon/streaminterface_p.h ../phonon/../3rdparty/phonon/phonon/videowidget_p.h ../phonon/../3rdparty/phonon/phonon/volumefadereffect_p.h ../phonon/../3rdparty/phonon/phonon/volumeslider_p.h
Note: See TracChangeset for help on using the changeset viewer.