Changeset 846 for trunk/include/phonon

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• include/phonon/AudioDataOutput (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/AudioDataOutput )
• include/phonon/AudioDataOutputInterface (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/AudioDataOutputInterface )
• include/phonon/GlobalConfig (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/GlobalConfig )
• include/phonon/PulseSupport (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/PulseSupport )
• include/phonon/VideoWidgetInterface44 (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/VideoWidgetInterface44 )
• include/phonon/VideoWidgetInterfaceLatest (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/VideoWidgetInterfaceLatest )
• include/phonon/audiodataoutput.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/audiodataoutput.h )
• include/phonon/audiodataoutputinterface.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/audiodataoutputinterface.h )
• include/phonon/globalconfig.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/globalconfig.h )
• include/phonon/headers.pri (modified) (1 diff)
• include/phonon/phonon (modified) (3 diffs)
• include/phonon/private/audiodataoutput_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/private/audiodataoutput_p.h )
• include/phonon/private/swiftslider_p.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/private/swiftslider_p.h )
• include/phonon/pulsesupport.h (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon/pulsesupport.h )

trunk/include/phonon/headers.pri

@@ -1 @@
-SYNCQT.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 ../../include/phonon_compat/Phonon/Phonon 
-SYNCQT.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 
-SYNCQT.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 
+SYNCQT.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/audio.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 ../../include/phonon_compat/Phonon/Phonon 
+SYNCQT.HEADER_CLASSES = ../../include/phonon/AbstractAudioOutput ../../include/phonon/AbstractMediaStream ../../include/phonon/AbstractVideoOutput ../../include/phonon/AddonInterface ../../include/phonon/Audio ../../include/phonon/VolumeFaderEffect ../../include/phonon/VolumeFaderInterface ../../include/phonon/VolumeSlider 
+SYNCQT.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/audio_p.h ../phonon/../3rdparty/phonon/phonon/videowidget_p.h ../phonon/../3rdparty/phonon/phonon/volumefadereffect_p.h ../phonon/../3rdparty/phonon/phonon/volumeslider_p.h 

trunk/include/phonon/phonon

@@ -5 +5 @@
 #include "abstractvideooutput.h"
 #include "addoninterface.h"
+
+
 #include "audiooutput.h"
 #include "audiooutputinterface.h"
@@ -13 +15 @@
 #include "effectparameter.h"
 #include "effectwidget.h"
+
 #include "mediacontroller.h"
 #include "medianode.h"
@@ -24 +27 @@
 #include "phononnamespace.h"
 #include "platformplugin.h"
+
 #include "seekslider.h"
 #include "streaminterface.h"