Changeset 560 for trunk/include/phonon/private

Timestamp:

Feb 10, 2010, 2:51:43 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

Reverted back r6 before merging with vendor/4.6.1 where the conflict is solved.

Location:

trunk/include/phonon

Files:

• . (copied) (copied from trunk/include/phonon )
• private (copied) (copied from trunk/include/phonon/private )
• private/abstractaudiooutput_p.h (copied) (copied from trunk/include/phonon/private/abstractaudiooutput_p.h )
• private/abstractmediastream_p.h (copied) (copied from trunk/include/phonon/private/abstractmediastream_p.h )
• private/abstractvideooutput_p.h (copied) (copied from trunk/include/phonon/private/abstractvideooutput_p.h )
• private/audiooutput_p.h (copied) (copied from trunk/include/phonon/private/audiooutput_p.h )
• private/audiooutputadaptor_p.h (copied) (copied from trunk/include/phonon/private/audiooutputadaptor_p.h )
• private/backendcapabilities_p.h (copied) (copied from trunk/include/phonon/private/backendcapabilities_p.h )
• private/effect_p.h (copied) (copied from trunk/include/phonon/private/effect_p.h )
• private/effectparameter_p.h (copied) (copied from trunk/include/phonon/private/effectparameter_p.h )
• private/effectwidget_p.h (copied) (copied from trunk/include/phonon/private/effectwidget_p.h )
• private/factory_p.h (copied) (copied from trunk/include/phonon/private/factory_p.h )
• private/frontendinterface_p.h (copied) (copied from trunk/include/phonon/private/frontendinterface_p.h )
• private/globalconfig_p.h (copied) (copied from trunk/include/phonon/private/globalconfig_p.h )
• private/globalstatic_p.h (copied) (copied from trunk/include/phonon/private/globalstatic_p.h )
• private/iodevicestream_p.h (copied) (copied from trunk/include/phonon/private/iodevicestream_p.h )
• private/medianode_p.h (copied) (copied from trunk/include/phonon/private/medianode_p.h )
• private/medianodedestructionhandler_p.h (copied) (copied from trunk/include/phonon/private/medianodedestructionhandler_p.h )
• private/mediaobject_p.h (copied) (copied from trunk/include/phonon/private/mediaobject_p.h )
• private/mediasource_p.h (copied) (copied from trunk/include/phonon/private/mediasource_p.h )
• private/objectdescription_p.h (copied) (copied from trunk/include/phonon/private/objectdescription_p.h )
• private/objectdescriptionmodel_p.h (copied) (copied from trunk/include/phonon/private/objectdescriptionmodel_p.h )
• private/path_p.h (copied) (copied from trunk/include/phonon/private/path_p.h )
• private/phonondefs_p.h (copied) (copied from trunk/include/phonon/private/phonondefs_p.h )
• private/phononnamespace_p.h (copied) (copied from trunk/include/phonon/private/phononnamespace_p.h )
• private/platform_p.h (copied) (copied from trunk/include/phonon/private/platform_p.h )
• private/qsettingsgroup_p.h (copied) (copied from trunk/include/phonon/private/qsettingsgroup_p.h )
• private/seekslider_p.h (copied) (copied from trunk/include/phonon/private/seekslider_p.h )
• private/streaminterface_p.h (copied) (copied from trunk/include/phonon/private/streaminterface_p.h )
• private/videowidget_p.h (copied) (copied from trunk/include/phonon/private/videowidget_p.h )
• private/volumefadereffect_p.h (copied) (copied from trunk/include/phonon/private/volumefadereffect_p.h )
• private/volumeslider_p.h (copied) (copied from trunk/include/phonon/private/volumeslider_p.h )