Changeset 846 for trunk/include/phonon_compat

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_compat/Phonon/AudioDataOutput (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon_compat/Phonon/AudioDataOutput )
• include/phonon_compat/Phonon/AudioDataOutputInterface (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon_compat/Phonon/AudioDataOutputInterface )
• include/phonon_compat/Phonon/GlobalConfig (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon_compat/Phonon/GlobalConfig )
• include/phonon_compat/Phonon/Phonon (modified) (3 diffs)
• include/phonon_compat/Phonon/PulseSupport (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon_compat/Phonon/PulseSupport )
• include/phonon_compat/Phonon/VideoWidgetInterface44 (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon_compat/Phonon/VideoWidgetInterface44 )
• include/phonon_compat/Phonon/VideoWidgetInterfaceLatest (copied) (copied from branches/vendor/nokia/qt/4.7.2/include/phonon_compat/Phonon/VideoWidgetInterfaceLatest )

trunk/include/phonon_compat/Phonon/Phonon

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