Changeset 651 for trunk/include/phonon_compat/Phonon
- Timestamp:
- Mar 8, 2010, 12:52:58 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 1 edited
- 47 copied
-
. (modified) (1 prop)
-
include/phonon_compat (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat )
-
include/phonon_compat/Phonon (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon )
-
include/phonon_compat/Phonon/AbstractAudioOutput (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AbstractAudioOutput )
-
include/phonon_compat/Phonon/AbstractMediaStream (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AbstractMediaStream )
-
include/phonon_compat/Phonon/AbstractVideoOutput (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AbstractVideoOutput )
-
include/phonon_compat/Phonon/AddonInterface (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AddonInterface )
-
include/phonon_compat/Phonon/AudioCaptureDevice (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioCaptureDevice )
-
include/phonon_compat/Phonon/AudioCaptureDeviceModel (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioCaptureDeviceModel )
-
include/phonon_compat/Phonon/AudioChannelDescription (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioChannelDescription )
-
include/phonon_compat/Phonon/AudioChannelDescriptionModel (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioChannelDescriptionModel )
-
include/phonon_compat/Phonon/AudioOutput (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioOutput )
-
include/phonon_compat/Phonon/AudioOutputDevice (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioOutputDevice )
-
include/phonon_compat/Phonon/AudioOutputDeviceModel (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioOutputDeviceModel )
-
include/phonon_compat/Phonon/AudioOutputInterface (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioOutputInterface )
-
include/phonon_compat/Phonon/AudioOutputInterface40 (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioOutputInterface40 )
-
include/phonon_compat/Phonon/AudioOutputInterface42 (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/AudioOutputInterface42 )
-
include/phonon_compat/Phonon/BackendCapabilities (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/BackendCapabilities )
-
include/phonon_compat/Phonon/BackendInterface (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/BackendInterface )
-
include/phonon_compat/Phonon/Effect (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/Effect )
-
include/phonon_compat/Phonon/EffectDescription (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/EffectDescription )
-
include/phonon_compat/Phonon/EffectDescriptionModel (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/EffectDescriptionModel )
-
include/phonon_compat/Phonon/EffectInterface (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/EffectInterface )
-
include/phonon_compat/Phonon/EffectParameter (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/EffectParameter )
-
include/phonon_compat/Phonon/EffectWidget (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/EffectWidget )
-
include/phonon_compat/Phonon/Global (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/Global )
-
include/phonon_compat/Phonon/MediaController (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/MediaController )
-
include/phonon_compat/Phonon/MediaNode (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/MediaNode )
-
include/phonon_compat/Phonon/MediaObject (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/MediaObject )
-
include/phonon_compat/Phonon/MediaObjectInterface (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/MediaObjectInterface )
-
include/phonon_compat/Phonon/MediaSource (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/MediaSource )
-
include/phonon_compat/Phonon/ObjectDescription (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/ObjectDescription )
-
include/phonon_compat/Phonon/ObjectDescriptionData (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/ObjectDescriptionData )
-
include/phonon_compat/Phonon/ObjectDescriptionModel (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/ObjectDescriptionModel )
-
include/phonon_compat/Phonon/ObjectDescriptionModelData (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/ObjectDescriptionModelData )
-
include/phonon_compat/Phonon/Path (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/Path )
-
include/phonon_compat/Phonon/Phonon (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/Phonon )
-
include/phonon_compat/Phonon/PlatformPlugin (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/PlatformPlugin )
-
include/phonon_compat/Phonon/SeekSlider (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/SeekSlider )
-
include/phonon_compat/Phonon/StreamInterface (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/StreamInterface )
-
include/phonon_compat/Phonon/SubtitleDescription (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/SubtitleDescription )
-
include/phonon_compat/Phonon/SubtitleDescriptionModel (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/SubtitleDescriptionModel )
-
include/phonon_compat/Phonon/VideoPlayer (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/VideoPlayer )
-
include/phonon_compat/Phonon/VideoWidget (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/VideoWidget )
-
include/phonon_compat/Phonon/VideoWidgetInterface (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/VideoWidgetInterface )
-
include/phonon_compat/Phonon/VolumeFaderEffect (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/VolumeFaderEffect )
-
include/phonon_compat/Phonon/VolumeFaderInterface (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/VolumeFaderInterface )
-
include/phonon_compat/Phonon/VolumeSlider (copied) (copied from branches/vendor/nokia/qt/4.6.2/include/phonon_compat/Phonon/VolumeSlider )
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.6.2 (added) merged: 650 /branches/vendor/nokia/qt/current merged: 649 /branches/vendor/nokia/qt/4.6.1 removed
- Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
