Changeset 560

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

Files:

• phonon (copied) (copied from trunk/include/phonon )
• phonon/abstractaudiooutput.h (copied) (copied from trunk/include/phonon/abstractaudiooutput.h )
• phonon/abstractmediastream.h (copied) (copied from trunk/include/phonon/abstractmediastream.h )
• phonon/abstractvideooutput.h (copied) (copied from trunk/include/phonon/abstractvideooutput.h )
• phonon/addoninterface.h (copied) (copied from trunk/include/phonon/addoninterface.h )
• phonon/audiooutput.h (copied) (copied from trunk/include/phonon/audiooutput.h )
• phonon/audiooutputinterface.h (copied) (copied from trunk/include/phonon/audiooutputinterface.h )
• phonon/backendcapabilities.h (copied) (copied from trunk/include/phonon/backendcapabilities.h )
• phonon/backendinterface.h (copied) (copied from trunk/include/phonon/backendinterface.h )
• phonon/effect.h (copied) (copied from trunk/include/phonon/effect.h )
• phonon/effectinterface.h (copied) (copied from trunk/include/phonon/effectinterface.h )
• phonon/effectparameter.h (copied) (copied from trunk/include/phonon/effectparameter.h )
• phonon/effectwidget.h (copied) (copied from trunk/include/phonon/effectwidget.h )
• phonon/headers.pri (copied) (copied from trunk/include/phonon/headers.pri )
• phonon/mediacontroller.h (copied) (copied from trunk/include/phonon/mediacontroller.h )
• phonon/medianode.h (copied) (copied from trunk/include/phonon/medianode.h )
• phonon/mediaobject.h (copied) (copied from trunk/include/phonon/mediaobject.h )
• phonon/mediaobjectinterface.h (copied) (copied from trunk/include/phonon/mediaobjectinterface.h )
• phonon/mediasource.h (copied) (copied from trunk/include/phonon/mediasource.h )
• phonon/objectdescription.h (copied) (copied from trunk/include/phonon/objectdescription.h )
• phonon/objectdescriptionmodel.h (copied) (copied from trunk/include/phonon/objectdescriptionmodel.h )
• phonon/path.h (copied) (copied from trunk/include/phonon/path.h )
• phonon/phonon (copied) (copied from trunk/include/phonon/phonon )
• phonon/phonon_export.h (copied) (copied from trunk/include/phonon/phonon_export.h )
• phonon/phonondefs.h (copied) (copied from trunk/include/phonon/phonondefs.h )
• phonon/phononnamespace.h (copied) (copied from trunk/include/phonon/phononnamespace.h )
• phonon/platformplugin.h (copied) (copied from trunk/include/phonon/platformplugin.h )
• phonon/private (copied) (copied from trunk/include/phonon/private )
• phonon/private/abstractaudiooutput_p.h (copied) (copied from trunk/include/phonon/private/abstractaudiooutput_p.h )
• phonon/private/abstractmediastream_p.h (copied) (copied from trunk/include/phonon/private/abstractmediastream_p.h )
• phonon/private/abstractvideooutput_p.h (copied) (copied from trunk/include/phonon/private/abstractvideooutput_p.h )
• phonon/private/audiooutput_p.h (copied) (copied from trunk/include/phonon/private/audiooutput_p.h )
• phonon/private/audiooutputadaptor_p.h (copied) (copied from trunk/include/phonon/private/audiooutputadaptor_p.h )
• phonon/private/backendcapabilities_p.h (copied) (copied from trunk/include/phonon/private/backendcapabilities_p.h )
• phonon/private/effect_p.h (copied) (copied from trunk/include/phonon/private/effect_p.h )
• phonon/private/effectparameter_p.h (copied) (copied from trunk/include/phonon/private/effectparameter_p.h )
• phonon/private/effectwidget_p.h (copied) (copied from trunk/include/phonon/private/effectwidget_p.h )
• phonon/private/factory_p.h (copied) (copied from trunk/include/phonon/private/factory_p.h )
• phonon/private/frontendinterface_p.h (copied) (copied from trunk/include/phonon/private/frontendinterface_p.h )
• phonon/private/globalconfig_p.h (copied) (copied from trunk/include/phonon/private/globalconfig_p.h )
• phonon/private/globalstatic_p.h (copied) (copied from trunk/include/phonon/private/globalstatic_p.h )
• phonon/private/iodevicestream_p.h (copied) (copied from trunk/include/phonon/private/iodevicestream_p.h )
• phonon/private/medianode_p.h (copied) (copied from trunk/include/phonon/private/medianode_p.h )
• phonon/private/medianodedestructionhandler_p.h (copied) (copied from trunk/include/phonon/private/medianodedestructionhandler_p.h )
• phonon/private/mediaobject_p.h (copied) (copied from trunk/include/phonon/private/mediaobject_p.h )
• phonon/private/mediasource_p.h (copied) (copied from trunk/include/phonon/private/mediasource_p.h )
• phonon/private/objectdescription_p.h (copied) (copied from trunk/include/phonon/private/objectdescription_p.h )
• phonon/private/objectdescriptionmodel_p.h (copied) (copied from trunk/include/phonon/private/objectdescriptionmodel_p.h )
• phonon/private/path_p.h (copied) (copied from trunk/include/phonon/private/path_p.h )
• phonon/private/phonondefs_p.h (copied) (copied from trunk/include/phonon/private/phonondefs_p.h )
• phonon/private/phononnamespace_p.h (copied) (copied from trunk/include/phonon/private/phononnamespace_p.h )
• phonon/private/platform_p.h (copied) (copied from trunk/include/phonon/private/platform_p.h )
• phonon/private/qsettingsgroup_p.h (copied) (copied from trunk/include/phonon/private/qsettingsgroup_p.h )
• phonon/private/seekslider_p.h (copied) (copied from trunk/include/phonon/private/seekslider_p.h )
• phonon/private/streaminterface_p.h (copied) (copied from trunk/include/phonon/private/streaminterface_p.h )
• phonon/private/videowidget_p.h (copied) (copied from trunk/include/phonon/private/videowidget_p.h )
• phonon/private/volumefadereffect_p.h (copied) (copied from trunk/include/phonon/private/volumefadereffect_p.h )
• phonon/private/volumeslider_p.h (copied) (copied from trunk/include/phonon/private/volumeslider_p.h )
• phonon/seekslider.h (copied) (copied from trunk/include/phonon/seekslider.h )
• phonon/streaminterface.h (copied) (copied from trunk/include/phonon/streaminterface.h )
• phonon/videoplayer.h (copied) (copied from trunk/include/phonon/videoplayer.h )
• phonon/videowidget.h (copied) (copied from trunk/include/phonon/videowidget.h )
• phonon/videowidgetinterface.h (copied) (copied from trunk/include/phonon/videowidgetinterface.h )
• phonon/volumefadereffect.h (copied) (copied from trunk/include/phonon/volumefadereffect.h )
• phonon/volumefaderinterface.h (copied) (copied from trunk/include/phonon/volumefaderinterface.h )
• phonon/volumeslider.h (copied) (copied from trunk/include/phonon/volumeslider.h )
• phonon_ (deleted)