diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/AudioDataOutput qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/AudioDataOutput
--- qt-everywhere-opensource-src-4.6.2/include/phonon/AudioDataOutput	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/AudioDataOutput	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "audiodataoutput.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/audiodataoutput.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/audiodataoutput.h
--- qt-everywhere-opensource-src-4.6.2/include/phonon/audiodataoutput.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/audiodataoutput.h	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "../../src/phonon/../3rdparty/phonon/phonon/audiodataoutput.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/AudioDataOutputInterface qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/AudioDataOutputInterface
--- qt-everywhere-opensource-src-4.6.2/include/phonon/AudioDataOutputInterface	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/AudioDataOutputInterface	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "audiodataoutputinterface.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/audiodataoutputinterface.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/audiodataoutputinterface.h
--- qt-everywhere-opensource-src-4.6.2/include/phonon/audiodataoutputinterface.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/audiodataoutputinterface.h	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "../../src/phonon/../3rdparty/phonon/phonon/audiodataoutputinterface.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/GlobalConfig qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/GlobalConfig
--- qt-everywhere-opensource-src-4.6.2/include/phonon/GlobalConfig	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/GlobalConfig	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "globalconfig.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/globalconfig.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/globalconfig.h
--- qt-everywhere-opensource-src-4.6.2/include/phonon/globalconfig.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/globalconfig.h	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "../../src/phonon/../3rdparty/phonon/phonon/globalconfig.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/phonon/headers.pri	2010-02-11 16:55:14.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/headers.pri	2010-02-23 14:51:02.179614979 +0100
@@ -1,3 +1,3 @@
-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/audiodataoutput.h ../phonon/../3rdparty/phonon/phonon/audiodataoutputinterface.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/globalconfig.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/pulsesupport.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/AudioDataOutput ../../include/phonon/AudioDataOutputInterface ../../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/GlobalConfig ../../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/PulseSupport ../../include/phonon/SeekSlider ../../include/phonon/StreamInterface ../../include/phonon/VideoPlayer ../../include/phonon/VideoWidget ../../include/phonon/VideoWidgetInterface ../../include/phonon/VideoWidgetInterface44 ../../include/phonon/VideoWidgetInterfaceLatest ../../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/audiodataoutput_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/swiftslider_p.h ../phonon/../3rdparty/phonon/phonon/videowidget_p.h ../phonon/../3rdparty/phonon/phonon/volumefadereffect_p.h ../phonon/../3rdparty/phonon/phonon/volumeslider_p.h 
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/phonon qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/phonon
--- qt-everywhere-opensource-src-4.6.2/include/phonon/phonon	2010-02-11 16:55:14.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/phonon	2010-02-23 14:47:28.104613727 +0100
@@ -4,6 +4,8 @@
 #include "abstractmediastream.h"
 #include "abstractvideooutput.h"
 #include "addoninterface.h"
+#include "audiodataoutput.h"
+#include "audiodataoutputinterface.h"
 #include "audiooutput.h"
 #include "audiooutputinterface.h"
 #include "backendcapabilities.h"
@@ -12,6 +14,7 @@
 #include "effectinterface.h"
 #include "effectparameter.h"
 #include "effectwidget.h"
+#include "globalconfig.h"
 #include "mediacontroller.h"
 #include "medianode.h"
 #include "mediaobject.h"
@@ -23,6 +26,7 @@
 #include "phonondefs.h"
 #include "phononnamespace.h"
 #include "platformplugin.h"
+#include "pulsesupport.h"
 #include "seekslider.h"
 #include "streaminterface.h"
 #include "videoplayer.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/private/audiodataoutput_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/private/audiodataoutput_p.h
--- qt-everywhere-opensource-src-4.6.2/include/phonon/private/audiodataoutput_p.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/private/audiodataoutput_p.h	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "../../../src/phonon/../3rdparty/phonon/phonon/audiodataoutput_p.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/private/swiftslider_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/private/swiftslider_p.h
--- qt-everywhere-opensource-src-4.6.2/include/phonon/private/swiftslider_p.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/private/swiftslider_p.h	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "../../../src/phonon/../3rdparty/phonon/phonon/swiftslider_p.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/PulseSupport qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/PulseSupport
--- qt-everywhere-opensource-src-4.6.2/include/phonon/PulseSupport	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/PulseSupport	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "pulsesupport.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/pulsesupport.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/pulsesupport.h
--- qt-everywhere-opensource-src-4.6.2/include/phonon/pulsesupport.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/pulsesupport.h	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "../../src/phonon/../3rdparty/phonon/phonon/pulsesupport.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/VideoWidgetInterface44 qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/VideoWidgetInterface44
--- qt-everywhere-opensource-src-4.6.2/include/phonon/VideoWidgetInterface44	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/VideoWidgetInterface44	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "videowidgetinterface.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon/VideoWidgetInterfaceLatest qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/VideoWidgetInterfaceLatest
--- qt-everywhere-opensource-src-4.6.2/include/phonon/VideoWidgetInterfaceLatest	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon/VideoWidgetInterfaceLatest	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1 @@
+#include "videowidgetinterface.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/AudioDataOutput qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/AudioDataOutput
--- qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/AudioDataOutput	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/AudioDataOutput	2010-02-23 14:51:02.035613650 +0100
@@ -0,0 +1 @@
+#include "../../phonon/audiodataoutput.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/AudioDataOutputInterface qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/AudioDataOutputInterface
--- qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/AudioDataOutputInterface	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/AudioDataOutputInterface	2010-02-23 14:51:02.035613650 +0100
@@ -0,0 +1 @@
+#include "../../phonon/audiodataoutputinterface.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/GlobalConfig qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/GlobalConfig
--- qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/GlobalConfig	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/GlobalConfig	2010-02-23 14:51:02.067613758 +0100
@@ -0,0 +1 @@
+#include "../../phonon/globalconfig.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/Phonon qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/Phonon
--- qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/Phonon	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/Phonon	2010-02-23 14:51:02.179614979 +0100
@@ -4,6 +4,8 @@
 #include "abstractmediastream.h"
 #include "abstractvideooutput.h"
 #include "addoninterface.h"
+#include "audiodataoutput.h"
+#include "audiodataoutputinterface.h"
 #include "audiooutput.h"
 #include "audiooutputinterface.h"
 #include "backendcapabilities.h"
@@ -12,6 +14,7 @@
 #include "effectinterface.h"
 #include "effectparameter.h"
 #include "effectwidget.h"
+#include "globalconfig.h"
 #include "mediacontroller.h"
 #include "medianode.h"
 #include "mediaobject.h"
@@ -23,6 +26,7 @@
 #include "phonondefs.h"
 #include "phononnamespace.h"
 #include "platformplugin.h"
+#include "pulsesupport.h"
 #include "seekslider.h"
 #include "streaminterface.h"
 #include "videoplayer.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/PulseSupport qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/PulseSupport
--- qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/PulseSupport	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/PulseSupport	2010-02-23 14:51:02.143617333 +0100
@@ -0,0 +1 @@
+#include "../../phonon/pulsesupport.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/VideoWidgetInterface44 qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/VideoWidgetInterface44
--- qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/VideoWidgetInterface44	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/VideoWidgetInterface44	2010-02-23 14:51:02.163618457 +0100
@@ -0,0 +1 @@
+#include "../../phonon/videowidgetinterface.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/VideoWidgetInterfaceLatest qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/VideoWidgetInterfaceLatest
--- qt-everywhere-opensource-src-4.6.2/include/phonon_compat/Phonon/VideoWidgetInterfaceLatest	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/phonon_compat/Phonon/VideoWidgetInterfaceLatest	2010-02-23 14:51:02.163618457 +0100
@@ -0,0 +1 @@
+#include "../../phonon/videowidgetinterface.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/Qt3Support/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/Qt3Support/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/Qt3Support/headers.pri	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/Qt3Support/headers.pri	2010-02-23 14:51:02.655613295 +0100
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../qt3support/widgets/q3action.h ../qt3support/widgets/q3button.h ../qt3support/widgets/q3buttongroup.h ../qt3support/widgets/q3combobox.h ../qt3support/widgets/q3datetimeedit.h ../qt3support/widgets/q3dockarea.h ../qt3support/widgets/q3dockwindow.h ../qt3support/widgets/q3frame.h ../qt3support/widgets/q3grid.h ../qt3support/widgets/q3gridview.h ../qt3support/widgets/q3groupbox.h ../qt3support/widgets/q3hbox.h ../qt3support/widgets/q3header.h ../qt3support/widgets/q3hgroupbox.h ../qt3support/widgets/q3mainwindow.h ../qt3support/widgets/q3popupmenu.h ../qt3support/widgets/q3progressbar.h ../qt3support/widgets/q3rangecontrol.h ../qt3support/widgets/q3scrollview.h ../qt3support/widgets/q3toolbar.h ../qt3support/widgets/q3vbox.h ../qt3support/widgets/q3vgroupbox.h ../qt3support/widgets/q3whatsthis.h ../qt3support/widgets/q3widgetstack.h ../qt3support/sql/q3databrowser.h ../qt3support/sql/q3datatable.h ../qt3support/sql/q3dataview.h ../qt3support/sql/q3editorfactory.h ../qt3support/sql/q3sqlcursor.h ../qt3support/sql/q3sqleditorfactory.h ../qt3support/sql/q3sqlfieldinfo.h ../qt3support/sql/q3sqlform.h ../qt3support/sql/q3sqlpropertymap.h ../qt3support/sql/q3sqlrecordinfo.h ../qt3support/sql/q3sqlselectcursor.h ../qt3support/network/q3dns.h ../qt3support/network/q3ftp.h ../qt3support/network/q3http.h ../qt3support/network/q3localfs.h ../qt3support/network/q3network.h ../qt3support/network/q3networkprotocol.h ../qt3support/network/q3serversocket.h ../qt3support/network/q3socket.h ../qt3support/network/q3socketdevice.h ../qt3support/network/q3url.h ../qt3support/network/q3urloperator.h ../qt3support/text/q3multilineedit.h ../qt3support/text/q3simplerichtext.h ../qt3support/text/q3stylesheet.h ../qt3support/text/q3syntaxhighlighter.h ../qt3support/text/q3textbrowser.h ../qt3support/text/q3textedit.h ../qt3support/text/q3textstream.h ../qt3support/text/q3textview.h ../qt3support/dialogs/q3filedialog.h ../qt3support/dialogs/q3progressdialog.h ../qt3support/dialogs/q3tabdialog.h ../qt3support/dialogs/q3wizard.h ../qt3support/other/q3accel.h ../qt3support/other/q3boxlayout.h ../qt3support/other/q3dragobject.h ../qt3support/other/q3dropsite.h ../qt3support/other/q3gridlayout.h ../qt3support/other/q3mimefactory.h ../qt3support/other/q3polygonscanner.h ../qt3support/other/q3process.h ../qt3support/other/qiconset.h ../qt3support/tools/q3asciicache.h ../qt3support/tools/q3asciidict.h ../qt3support/tools/q3cache.h ../qt3support/tools/q3cleanuphandler.h ../qt3support/tools/q3cstring.h ../qt3support/tools/q3deepcopy.h ../qt3support/tools/q3dict.h ../qt3support/tools/q3garray.h ../qt3support/tools/q3gcache.h ../qt3support/tools/q3gdict.h ../qt3support/tools/q3glist.h ../qt3support/tools/q3gvector.h ../qt3support/tools/q3intcache.h ../qt3support/tools/q3intdict.h ../qt3support/tools/q3memarray.h ../qt3support/tools/q3objectdict.h ../qt3support/tools/q3ptrcollection.h ../qt3support/tools/q3ptrdict.h ../qt3support/tools/q3ptrlist.h ../qt3support/tools/q3ptrqueue.h ../qt3support/tools/q3ptrstack.h ../qt3support/tools/q3ptrvector.h ../qt3support/tools/q3semaphore.h ../qt3support/tools/q3shared.h ../qt3support/tools/q3signal.h ../qt3support/tools/q3sortedlist.h ../qt3support/tools/q3strlist.h ../qt3support/tools/q3strvec.h ../qt3support/tools/q3tl.h ../qt3support/tools/q3valuelist.h ../qt3support/tools/q3valuestack.h ../qt3support/tools/q3valuevector.h ../qt3support/itemviews/q3iconview.h ../qt3support/itemviews/q3listbox.h ../qt3support/itemviews/q3listview.h ../qt3support/itemviews/q3table.h ../qt3support/painting/q3paintdevicemetrics.h ../qt3support/painting/q3painter.h ../qt3support/painting/q3picture.h ../qt3support/painting/q3pointarray.h ../qt3support/canvas/q3canvas.h ../../include/Qt3Support/Qt3Support 
-SYNCQT.HEADER_CLASSES = ../../include/Qt3Support/Q3Action ../../include/Qt3Support/Q3ActionGroup ../../include/Qt3Support/Q3Button ../../include/Qt3Support/Q3ButtonGroup ../../include/Qt3Support/Q3VButtonGroup ../../include/Qt3Support/Q3HButtonGroup ../../include/Qt3Support/Q3ComboBox ../../include/Qt3Support/Q3DateTimeEditBase ../../include/Qt3Support/Q3DateEdit ../../include/Qt3Support/Q3TimeEdit ../../include/Qt3Support/Q3DateTimeEdit ../../include/Qt3Support/Q3DockAreaLayout ../../include/Qt3Support/Q3DockArea ../../include/Qt3Support/Q3DockWindow ../../include/Qt3Support/Q3Frame ../../include/Qt3Support/Q3Grid ../../include/Qt3Support/Q3GridView ../../include/Qt3Support/Q3GroupBox ../../include/Qt3Support/Q3HBox ../../include/Qt3Support/Q3Header ../../include/Qt3Support/Q3HGroupBox ../../include/Qt3Support/Q3MainWindow ../../include/Qt3Support/Q3PopupMenu ../../include/Qt3Support/Q3ProgressBar ../../include/Qt3Support/Q3RangeControl ../../include/Qt3Support/Q3SpinWidget ../../include/Qt3Support/Q3ScrollView ../../include/Qt3Support/Q3ToolBar ../../include/Qt3Support/Q3VBox ../../include/Qt3Support/Q3VGroupBox ../../include/Qt3Support/Q3WhatsThis ../../include/Qt3Support/Q3WidgetStack ../../include/Qt3Support/Q3DataBrowser ../../include/Qt3Support/Q3DataTable ../../include/Qt3Support/Q3DataView ../../include/Qt3Support/Q3EditorFactory ../../include/Qt3Support/Q3SqlCursor ../../include/Qt3Support/Q3SqlEditorFactory ../../include/Qt3Support/Q3SqlFieldInfo ../../include/Qt3Support/Q3SqlForm ../../include/Qt3Support/Q3SqlPropertyMap ../../include/Qt3Support/Q3SqlFieldInfoList ../../include/Qt3Support/Q3SqlRecordInfo ../../include/Qt3Support/Q3SqlSelectCursor ../../include/Qt3Support/Q3Dns ../../include/Qt3Support/Q3DnsSocket ../../include/Qt3Support/Q3Ftp ../../include/Qt3Support/Q3HttpHeader ../../include/Qt3Support/Q3HttpResponseHeader ../../include/Qt3Support/Q3HttpRequestHeader ../../include/Qt3Support/Q3Http ../../include/Qt3Support/Q3LocalFs ../../include/Qt3Support/Q3NetworkProtocolFactoryBase ../../include/Qt3Support/Q3NetworkProtocolFactory ../../include/Qt3Support/Q3NetworkProtocolDict ../../include/Qt3Support/Q3NetworkProtocol ../../include/Qt3Support/Q3NetworkOperation ../../include/Qt3Support/Q3ServerSocket ../../include/Qt3Support/Q3Socket ../../include/Qt3Support/Q3SocketDevice ../../include/Qt3Support/Q3Url ../../include/Qt3Support/Q3UrlOperator ../../include/Qt3Support/Q3MultiLineEdit ../../include/Qt3Support/Q3SimpleRichText ../../include/Qt3Support/Q3StyleSheetItem ../../include/Qt3Support/Q3StyleSheet ../../include/Qt3Support/Q3SyntaxHighlighter ../../include/Qt3Support/Q3TextBrowser ../../include/Qt3Support/Q3TextEditOptimPrivate ../../include/Qt3Support/Q3TextEdit ../../include/Qt3Support/Q3TextStream ../../include/Qt3Support/Q3TSFUNC ../../include/Qt3Support/Q3TextView ../../include/Qt3Support/Q3FileIconProvider ../../include/Qt3Support/Q3FilePreview ../../include/Qt3Support/Q3FileDialog ../../include/Qt3Support/Q3ProgressDialog ../../include/Qt3Support/Q3TabDialog ../../include/Qt3Support/Q3Wizard ../../include/Qt3Support/Q3Accel ../../include/Qt3Support/Q3BoxLayout ../../include/Qt3Support/Q3HBoxLayout ../../include/Qt3Support/Q3VBoxLayout ../../include/Qt3Support/Q3DragObject ../../include/Qt3Support/Q3StoredDrag ../../include/Qt3Support/Q3TextDrag ../../include/Qt3Support/Q3ImageDrag ../../include/Qt3Support/Q3UriDrag ../../include/Qt3Support/Q3ColorDrag ../../include/Qt3Support/Q3DropSite ../../include/Qt3Support/Q3GridLayout ../../include/Qt3Support/Q3MimeSourceFactory ../../include/Qt3Support/Q3PolygonScanner ../../include/Qt3Support/Q3Process ../../include/Qt3Support/Q3AsciiCache ../../include/Qt3Support/Q3AsciiCacheIterator ../../include/Qt3Support/Q3AsciiDict ../../include/Qt3Support/Q3AsciiDictIterator ../../include/Qt3Support/Q3Cache ../../include/Qt3Support/Q3CacheIterator ../../include/Qt3Support/Q3CleanupHandler ../../include/Qt3Support/Q3SingleCleanupHandler ../../include/Qt3Support/Q3CString ../../include/Qt3Support/Q3DeepCopy ../../include/Qt3Support/Q3Dict ../../include/Qt3Support/Q3DictIterator ../../include/Qt3Support/Q3GArray ../../include/Qt3Support/Q3GCache ../../include/Qt3Support/Q3GCacheIterator ../../include/Qt3Support/Q3BaseBucket ../../include/Qt3Support/Q3StringBucket ../../include/Qt3Support/Q3AsciiBucket ../../include/Qt3Support/Q3IntBucket ../../include/Qt3Support/Q3PtrBucket ../../include/Qt3Support/Q3GDict ../../include/Qt3Support/Q3GDictIterator ../../include/Qt3Support/Q3LNode ../../include/Qt3Support/Q3GList ../../include/Qt3Support/Q3GListIterator ../../include/Qt3Support/Q3GListStdIterator ../../include/Qt3Support/Q3GVector ../../include/Qt3Support/Q3IntCache ../../include/Qt3Support/Q3IntCacheIterator ../../include/Qt3Support/Q3IntDict ../../include/Qt3Support/Q3IntDictIterator ../../include/Qt3Support/Q3MemArray ../../include/Qt3Support/Q3ObjectDictionary ../../include/Qt3Support/Q3PtrCollection ../../include/Qt3Support/Q3PtrDict ../../include/Qt3Support/Q3PtrDictIterator ../../include/Qt3Support/Q3PtrListStdIterator ../../include/Qt3Support/Q3PtrList ../../include/Qt3Support/Q3PtrListIterator ../../include/Qt3Support/Q3PtrQueue ../../include/Qt3Support/Q3PtrStack ../../include/Qt3Support/Q3PtrVector ../../include/Qt3Support/Q3Semaphore ../../include/Qt3Support/Q3Shared ../../include/Qt3Support/Q3Signal ../../include/Qt3Support/Q3SortedList ../../include/Qt3Support/Q3StrListIterator ../../include/Qt3Support/Q3StrList ../../include/Qt3Support/Q3StrIList ../../include/Qt3Support/Q3StrVec ../../include/Qt3Support/Q3StrIVec ../../include/Qt3Support/Q3ValueListIterator ../../include/Qt3Support/Q3ValueListConstIterator ../../include/Qt3Support/Q3ValueList ../../include/Qt3Support/Q3ValueStack ../../include/Qt3Support/Q3ValueVector ../../include/Qt3Support/Q3IconDragItem ../../include/Qt3Support/Q3IconDrag ../../include/Qt3Support/Q3IconViewItem ../../include/Qt3Support/Q3IconView ../../include/Qt3Support/Q3ListBox ../../include/Qt3Support/Q3ListBoxItem ../../include/Qt3Support/Q3ListBoxText ../../include/Qt3Support/Q3ListBoxPixmap ../../include/Qt3Support/Q3ListViewItem ../../include/Qt3Support/Q3ListView ../../include/Qt3Support/Q3CheckListItem ../../include/Qt3Support/Q3ListViewItemIterator ../../include/Qt3Support/Q3TableSelection ../../include/Qt3Support/Q3TableItem ../../include/Qt3Support/Q3ComboTableItem ../../include/Qt3Support/Q3CheckTableItem ../../include/Qt3Support/Q3Table ../../include/Qt3Support/Q3PaintDeviceMetrics ../../include/Qt3Support/Q3Painter ../../include/Qt3Support/Q3Picture ../../include/Qt3Support/Q3PointArray ../../include/Qt3Support/Q3CanvasItemList ../../include/Qt3Support/Q3CanvasItem ../../include/Qt3Support/Q3Canvas ../../include/Qt3Support/Q3CanvasView ../../include/Qt3Support/Q3CanvasPixmap ../../include/Qt3Support/Q3CanvasPixmapArray ../../include/Qt3Support/Q3CanvasSprite ../../include/Qt3Support/Q3CanvasPolygonalItem ../../include/Qt3Support/Q3CanvasRectangle ../../include/Qt3Support/Q3CanvasPolygon ../../include/Qt3Support/Q3CanvasSpline ../../include/Qt3Support/Q3CanvasLine ../../include/Qt3Support/Q3CanvasEllipse ../../include/Qt3Support/Q3CanvasText 
-SYNCQT.PRIVATE_HEADER_FILES = ../qt3support/widgets/q3mainwindow_p.h ../qt3support/widgets/q3titlebar_p.h ../qt3support/sql/q3sqlmanager_p.h ../qt3support/text/q3richtext_p.h ../qt3support/text/q3syntaxhighlighter_p.h ../qt3support/other/q3membuf_p.h ../qt3support/other/qt_compat_pch.h ../qt3support/painting/q3paintengine_svg_p.h 
+SYNCQT.HEADER_FILES = ../qt3support/text/q3multilineedit.h ../qt3support/text/q3simplerichtext.h ../qt3support/text/q3stylesheet.h ../qt3support/text/q3syntaxhighlighter.h ../qt3support/text/q3textbrowser.h ../qt3support/text/q3textedit.h ../qt3support/text/q3textstream.h ../qt3support/text/q3textview.h ../qt3support/widgets/q3action.h ../qt3support/widgets/q3button.h ../qt3support/widgets/q3buttongroup.h ../qt3support/widgets/q3combobox.h ../qt3support/widgets/q3datetimeedit.h ../qt3support/widgets/q3dockarea.h ../qt3support/widgets/q3dockwindow.h ../qt3support/widgets/q3frame.h ../qt3support/widgets/q3grid.h ../qt3support/widgets/q3gridview.h ../qt3support/widgets/q3groupbox.h ../qt3support/widgets/q3hbox.h ../qt3support/widgets/q3header.h ../qt3support/widgets/q3hgroupbox.h ../qt3support/widgets/q3mainwindow.h ../qt3support/widgets/q3popupmenu.h ../qt3support/widgets/q3progressbar.h ../qt3support/widgets/q3rangecontrol.h ../qt3support/widgets/q3scrollview.h ../qt3support/widgets/q3toolbar.h ../qt3support/widgets/q3vbox.h ../qt3support/widgets/q3vgroupbox.h ../qt3support/widgets/q3whatsthis.h ../qt3support/widgets/q3widgetstack.h ../qt3support/painting/q3paintdevicemetrics.h ../qt3support/painting/q3painter.h ../qt3support/painting/q3picture.h ../qt3support/painting/q3pointarray.h ../qt3support/network/q3dns.h ../qt3support/network/q3ftp.h ../qt3support/network/q3http.h ../qt3support/network/q3localfs.h ../qt3support/network/q3network.h ../qt3support/network/q3networkprotocol.h ../qt3support/network/q3serversocket.h ../qt3support/network/q3socket.h ../qt3support/network/q3socketdevice.h ../qt3support/network/q3url.h ../qt3support/network/q3urloperator.h ../qt3support/sql/q3databrowser.h ../qt3support/sql/q3datatable.h ../qt3support/sql/q3dataview.h ../qt3support/sql/q3editorfactory.h ../qt3support/sql/q3sqlcursor.h ../qt3support/sql/q3sqleditorfactory.h ../qt3support/sql/q3sqlfieldinfo.h ../qt3support/sql/q3sqlform.h ../qt3support/sql/q3sqlpropertymap.h ../qt3support/sql/q3sqlrecordinfo.h ../qt3support/sql/q3sqlselectcursor.h ../qt3support/canvas/q3canvas.h ../qt3support/tools/q3asciicache.h ../qt3support/tools/q3asciidict.h ../qt3support/tools/q3cache.h ../qt3support/tools/q3cleanuphandler.h ../qt3support/tools/q3cstring.h ../qt3support/tools/q3deepcopy.h ../qt3support/tools/q3dict.h ../qt3support/tools/q3garray.h ../qt3support/tools/q3gcache.h ../qt3support/tools/q3gdict.h ../qt3support/tools/q3glist.h ../qt3support/tools/q3gvector.h ../qt3support/tools/q3intcache.h ../qt3support/tools/q3intdict.h ../qt3support/tools/q3memarray.h ../qt3support/tools/q3objectdict.h ../qt3support/tools/q3ptrcollection.h ../qt3support/tools/q3ptrdict.h ../qt3support/tools/q3ptrlist.h ../qt3support/tools/q3ptrqueue.h ../qt3support/tools/q3ptrstack.h ../qt3support/tools/q3ptrvector.h ../qt3support/tools/q3semaphore.h ../qt3support/tools/q3shared.h ../qt3support/tools/q3signal.h ../qt3support/tools/q3sortedlist.h ../qt3support/tools/q3strlist.h ../qt3support/tools/q3strvec.h ../qt3support/tools/q3tl.h ../qt3support/tools/q3valuelist.h ../qt3support/tools/q3valuestack.h ../qt3support/tools/q3valuevector.h ../qt3support/dialogs/q3filedialog.h ../qt3support/dialogs/q3progressdialog.h ../qt3support/dialogs/q3tabdialog.h ../qt3support/dialogs/q3wizard.h ../qt3support/other/q3accel.h ../qt3support/other/q3boxlayout.h ../qt3support/other/q3dragobject.h ../qt3support/other/q3dropsite.h ../qt3support/other/q3gridlayout.h ../qt3support/other/q3mimefactory.h ../qt3support/other/q3polygonscanner.h ../qt3support/other/q3process.h ../qt3support/other/qiconset.h ../qt3support/itemviews/q3iconview.h ../qt3support/itemviews/q3listbox.h ../qt3support/itemviews/q3listview.h ../qt3support/itemviews/q3table.h ../../include/Qt3Support/Qt3Support 
+SYNCQT.HEADER_CLASSES = ../../include/Qt3Support/Q3MultiLineEdit ../../include/Qt3Support/Q3SimpleRichText ../../include/Qt3Support/Q3StyleSheetItem ../../include/Qt3Support/Q3StyleSheet ../../include/Qt3Support/Q3SyntaxHighlighter ../../include/Qt3Support/Q3TextBrowser ../../include/Qt3Support/Q3TextEditOptimPrivate ../../include/Qt3Support/Q3TextEdit ../../include/Qt3Support/Q3TextStream ../../include/Qt3Support/Q3TSFUNC ../../include/Qt3Support/Q3TextView ../../include/Qt3Support/Q3Action ../../include/Qt3Support/Q3ActionGroup ../../include/Qt3Support/Q3Button ../../include/Qt3Support/Q3ButtonGroup ../../include/Qt3Support/Q3VButtonGroup ../../include/Qt3Support/Q3HButtonGroup ../../include/Qt3Support/Q3ComboBox ../../include/Qt3Support/Q3DateTimeEditBase ../../include/Qt3Support/Q3DateEdit ../../include/Qt3Support/Q3TimeEdit ../../include/Qt3Support/Q3DateTimeEdit ../../include/Qt3Support/Q3DockAreaLayout ../../include/Qt3Support/Q3DockArea ../../include/Qt3Support/Q3DockWindow ../../include/Qt3Support/Q3Frame ../../include/Qt3Support/Q3Grid ../../include/Qt3Support/Q3GridView ../../include/Qt3Support/Q3GroupBox ../../include/Qt3Support/Q3HBox ../../include/Qt3Support/Q3Header ../../include/Qt3Support/Q3HGroupBox ../../include/Qt3Support/Q3MainWindow ../../include/Qt3Support/Q3PopupMenu ../../include/Qt3Support/Q3ProgressBar ../../include/Qt3Support/Q3RangeControl ../../include/Qt3Support/Q3SpinWidget ../../include/Qt3Support/Q3ScrollView ../../include/Qt3Support/Q3ToolBar ../../include/Qt3Support/Q3VBox ../../include/Qt3Support/Q3VGroupBox ../../include/Qt3Support/Q3WhatsThis ../../include/Qt3Support/Q3WidgetStack ../../include/Qt3Support/Q3PaintDeviceMetrics ../../include/Qt3Support/Q3Painter ../../include/Qt3Support/Q3Picture ../../include/Qt3Support/Q3PointArray ../../include/Qt3Support/Q3Dns ../../include/Qt3Support/Q3DnsSocket ../../include/Qt3Support/Q3Ftp ../../include/Qt3Support/Q3HttpHeader ../../include/Qt3Support/Q3HttpResponseHeader ../../include/Qt3Support/Q3HttpRequestHeader ../../include/Qt3Support/Q3Http ../../include/Qt3Support/Q3LocalFs ../../include/Qt3Support/Q3NetworkProtocolFactoryBase ../../include/Qt3Support/Q3NetworkProtocolFactory ../../include/Qt3Support/Q3NetworkProtocolDict ../../include/Qt3Support/Q3NetworkProtocol ../../include/Qt3Support/Q3NetworkOperation ../../include/Qt3Support/Q3ServerSocket ../../include/Qt3Support/Q3Socket ../../include/Qt3Support/Q3SocketDevice ../../include/Qt3Support/Q3Url ../../include/Qt3Support/Q3UrlOperator ../../include/Qt3Support/Q3DataBrowser ../../include/Qt3Support/Q3DataTable ../../include/Qt3Support/Q3DataView ../../include/Qt3Support/Q3EditorFactory ../../include/Qt3Support/Q3SqlCursor ../../include/Qt3Support/Q3SqlEditorFactory ../../include/Qt3Support/Q3SqlFieldInfo ../../include/Qt3Support/Q3SqlForm ../../include/Qt3Support/Q3SqlPropertyMap ../../include/Qt3Support/Q3SqlFieldInfoList ../../include/Qt3Support/Q3SqlRecordInfo ../../include/Qt3Support/Q3SqlSelectCursor ../../include/Qt3Support/Q3CanvasItemList ../../include/Qt3Support/Q3CanvasItem ../../include/Qt3Support/Q3Canvas ../../include/Qt3Support/Q3CanvasView ../../include/Qt3Support/Q3CanvasPixmap ../../include/Qt3Support/Q3CanvasPixmapArray ../../include/Qt3Support/Q3CanvasSprite ../../include/Qt3Support/Q3CanvasPolygonalItem ../../include/Qt3Support/Q3CanvasRectangle ../../include/Qt3Support/Q3CanvasPolygon ../../include/Qt3Support/Q3CanvasSpline ../../include/Qt3Support/Q3CanvasLine ../../include/Qt3Support/Q3CanvasEllipse ../../include/Qt3Support/Q3CanvasText ../../include/Qt3Support/Q3AsciiCache ../../include/Qt3Support/Q3AsciiCacheIterator ../../include/Qt3Support/Q3AsciiDict ../../include/Qt3Support/Q3AsciiDictIterator ../../include/Qt3Support/Q3Cache ../../include/Qt3Support/Q3CacheIterator ../../include/Qt3Support/Q3CleanupHandler ../../include/Qt3Support/Q3SingleCleanupHandler ../../include/Qt3Support/Q3CString ../../include/Qt3Support/Q3DeepCopy ../../include/Qt3Support/Q3Dict ../../include/Qt3Support/Q3DictIterator ../../include/Qt3Support/Q3GArray ../../include/Qt3Support/Q3GCache ../../include/Qt3Support/Q3GCacheIterator ../../include/Qt3Support/Q3BaseBucket ../../include/Qt3Support/Q3StringBucket ../../include/Qt3Support/Q3AsciiBucket ../../include/Qt3Support/Q3IntBucket ../../include/Qt3Support/Q3PtrBucket ../../include/Qt3Support/Q3GDict ../../include/Qt3Support/Q3GDictIterator ../../include/Qt3Support/Q3LNode ../../include/Qt3Support/Q3GList ../../include/Qt3Support/Q3GListIterator ../../include/Qt3Support/Q3GListStdIterator ../../include/Qt3Support/Q3GVector ../../include/Qt3Support/Q3IntCache ../../include/Qt3Support/Q3IntCacheIterator ../../include/Qt3Support/Q3IntDict ../../include/Qt3Support/Q3IntDictIterator ../../include/Qt3Support/Q3MemArray ../../include/Qt3Support/Q3ObjectDictionary ../../include/Qt3Support/Q3PtrCollection ../../include/Qt3Support/Q3PtrDict ../../include/Qt3Support/Q3PtrDictIterator ../../include/Qt3Support/Q3PtrListStdIterator ../../include/Qt3Support/Q3PtrList ../../include/Qt3Support/Q3PtrListIterator ../../include/Qt3Support/Q3PtrQueue ../../include/Qt3Support/Q3PtrStack ../../include/Qt3Support/Q3PtrVector ../../include/Qt3Support/Q3Semaphore ../../include/Qt3Support/Q3Shared ../../include/Qt3Support/Q3Signal ../../include/Qt3Support/Q3SortedList ../../include/Qt3Support/Q3StrListIterator ../../include/Qt3Support/Q3StrList ../../include/Qt3Support/Q3StrIList ../../include/Qt3Support/Q3StrVec ../../include/Qt3Support/Q3StrIVec ../../include/Qt3Support/Q3ValueListIterator ../../include/Qt3Support/Q3ValueListConstIterator ../../include/Qt3Support/Q3ValueList ../../include/Qt3Support/Q3ValueStack ../../include/Qt3Support/Q3ValueVector ../../include/Qt3Support/Q3FileIconProvider ../../include/Qt3Support/Q3FilePreview ../../include/Qt3Support/Q3FileDialog ../../include/Qt3Support/Q3ProgressDialog ../../include/Qt3Support/Q3TabDialog ../../include/Qt3Support/Q3Wizard ../../include/Qt3Support/Q3Accel ../../include/Qt3Support/Q3BoxLayout ../../include/Qt3Support/Q3HBoxLayout ../../include/Qt3Support/Q3VBoxLayout ../../include/Qt3Support/Q3DragObject ../../include/Qt3Support/Q3StoredDrag ../../include/Qt3Support/Q3TextDrag ../../include/Qt3Support/Q3ImageDrag ../../include/Qt3Support/Q3UriDrag ../../include/Qt3Support/Q3ColorDrag ../../include/Qt3Support/Q3DropSite ../../include/Qt3Support/Q3GridLayout ../../include/Qt3Support/Q3MimeSourceFactory ../../include/Qt3Support/Q3PolygonScanner ../../include/Qt3Support/Q3Process ../../include/Qt3Support/Q3IconDragItem ../../include/Qt3Support/Q3IconDrag ../../include/Qt3Support/Q3IconViewItem ../../include/Qt3Support/Q3IconView ../../include/Qt3Support/Q3ListBox ../../include/Qt3Support/Q3ListBoxItem ../../include/Qt3Support/Q3ListBoxText ../../include/Qt3Support/Q3ListBoxPixmap ../../include/Qt3Support/Q3ListViewItem ../../include/Qt3Support/Q3ListView ../../include/Qt3Support/Q3CheckListItem ../../include/Qt3Support/Q3ListViewItemIterator ../../include/Qt3Support/Q3TableSelection ../../include/Qt3Support/Q3TableItem ../../include/Qt3Support/Q3ComboTableItem ../../include/Qt3Support/Q3CheckTableItem ../../include/Qt3Support/Q3Table 
+SYNCQT.PRIVATE_HEADER_FILES = ../qt3support/text/q3richtext_p.h ../qt3support/text/q3syntaxhighlighter_p.h ../qt3support/widgets/q3mainwindow_p.h ../qt3support/widgets/q3titlebar_p.h ../qt3support/painting/q3paintengine_svg_p.h ../qt3support/sql/q3sqlmanager_p.h ../qt3support/other/q3membuf_p.h ../qt3support/other/qt_compat_pch.h 
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/Qt3Support/Qt3Support qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/Qt3Support/Qt3Support
--- qt-everywhere-opensource-src-4.6.2/include/Qt3Support/Qt3Support	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/Qt3Support/Qt3Support	2010-02-23 14:51:02.655613295 +0100
@@ -4,6 +4,14 @@
 #include <QtGui/QtGui>
 #include <QtNetwork/QtNetwork>
 #include <QtSql/QtSql>
+#include "q3multilineedit.h"
+#include "q3simplerichtext.h"
+#include "q3stylesheet.h"
+#include "q3syntaxhighlighter.h"
+#include "q3textbrowser.h"
+#include "q3textedit.h"
+#include "q3textstream.h"
+#include "q3textview.h"
 #include "q3action.h"
 #include "q3button.h"
 #include "q3buttongroup.h"
@@ -28,17 +36,10 @@
 #include "q3vgroupbox.h"
 #include "q3whatsthis.h"
 #include "q3widgetstack.h"
-#include "q3databrowser.h"
-#include "q3datatable.h"
-#include "q3dataview.h"
-#include "q3editorfactory.h"
-#include "q3sqlcursor.h"
-#include "q3sqleditorfactory.h"
-#include "q3sqlfieldinfo.h"
-#include "q3sqlform.h"
-#include "q3sqlpropertymap.h"
-#include "q3sqlrecordinfo.h"
-#include "q3sqlselectcursor.h"
+#include "q3paintdevicemetrics.h"
+#include "q3painter.h"
+#include "q3picture.h"
+#include "q3pointarray.h"
 #include "q3dns.h"
 #include "q3ftp.h"
 #include "q3http.h"
@@ -50,27 +51,18 @@
 #include "q3socketdevice.h"
 #include "q3url.h"
 #include "q3urloperator.h"
-#include "q3multilineedit.h"
-#include "q3simplerichtext.h"
-#include "q3stylesheet.h"
-#include "q3syntaxhighlighter.h"
-#include "q3textbrowser.h"
-#include "q3textedit.h"
-#include "q3textstream.h"
-#include "q3textview.h"
-#include "q3filedialog.h"
-#include "q3progressdialog.h"
-#include "q3tabdialog.h"
-#include "q3wizard.h"
-#include "q3accel.h"
-#include "q3boxlayout.h"
-#include "q3dragobject.h"
-#include "q3dropsite.h"
-#include "q3gridlayout.h"
-#include "q3mimefactory.h"
-#include "q3polygonscanner.h"
-#include "q3process.h"
-#include "qiconset.h"
+#include "q3databrowser.h"
+#include "q3datatable.h"
+#include "q3dataview.h"
+#include "q3editorfactory.h"
+#include "q3sqlcursor.h"
+#include "q3sqleditorfactory.h"
+#include "q3sqlfieldinfo.h"
+#include "q3sqlform.h"
+#include "q3sqlpropertymap.h"
+#include "q3sqlrecordinfo.h"
+#include "q3sqlselectcursor.h"
+#include "q3canvas.h"
 #include "q3asciicache.h"
 #include "q3asciidict.h"
 #include "q3cache.h"
@@ -103,13 +95,21 @@
 #include "q3valuelist.h"
 #include "q3valuestack.h"
 #include "q3valuevector.h"
+#include "q3filedialog.h"
+#include "q3progressdialog.h"
+#include "q3tabdialog.h"
+#include "q3wizard.h"
+#include "q3accel.h"
+#include "q3boxlayout.h"
+#include "q3dragobject.h"
+#include "q3dropsite.h"
+#include "q3gridlayout.h"
+#include "q3mimefactory.h"
+#include "q3polygonscanner.h"
+#include "q3process.h"
+#include "qiconset.h"
 #include "q3iconview.h"
 #include "q3listbox.h"
 #include "q3listview.h"
 #include "q3table.h"
-#include "q3paintdevicemetrics.h"
-#include "q3painter.h"
-#include "q3picture.h"
-#include "q3pointarray.h"
-#include "q3canvas.h"
 #endif
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtCore/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtCore/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/QtCore/headers.pri	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtCore/headers.pri	2010-02-23 14:50:59.623613570 +0100
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../corelib/xml/qxmlstream.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../../include/QtCore/QtCore 
-SYNCQT.HEADER_CLASSES = ../../include/QtCore/QXmlStreamStringRef ../../include/QtCore/QXmlStreamAttribute ../../include/QtCore/QXmlStreamAttributes ../../include/QtCore/QXmlStreamNamespaceDeclaration ../../include/QtCore/QXmlStreamNamespaceDeclarations ../../include/QtCore/QXmlStreamNotationDeclaration ../../include/QtCore/QXmlStreamNotationDeclarations ../../include/QtCore/QXmlStreamEntityDeclaration ../../include/QtCore/QXmlStreamEntityDeclarations ../../include/QtCore/QXmlStreamEntityResolver ../../include/QtCore/QXmlStreamReader ../../include/QtCore/QXmlStreamWriter ../../include/QtCore/QAbstractFileEngine ../../include/QtCore/QAbstractFileEngineHandler ../../include/QtCore/QAbstractFileEngineIterator ../../include/QtCore/QBuffer ../../include/QtCore/QDataStream ../../include/QtCore/QtDebug ../../include/QtCore/QDebug ../../include/QtCore/QNoDebug ../../include/QtCore/QDir ../../include/QtCore/QDirIterator ../../include/QtCore/QFile ../../include/QtCore/QFileInfo ../../include/QtCore/QFileInfoList ../../include/QtCore/QFileInfoListIterator ../../include/QtCore/QFileSystemWatcher ../../include/QtCore/QFSFileEngine ../../include/QtCore/QIODevice ../../include/QtCore/Q_PID ../../include/QtCore/QProcessEnvironment ../../include/QtCore/QProcess ../../include/QtCore/QResource ../../include/QtCore/QSettings ../../include/QtCore/QTemporaryFile ../../include/QtCore/QTextStream ../../include/QtCore/QTextStreamFunction ../../include/QtCore/QTextStreamManipulator ../../include/QtCore/QTS ../../include/QtCore/QTextIStream ../../include/QtCore/QTextOStream ../../include/QtCore/QUrl ../../include/QtCore/QTextCodec ../../include/QtCore/QTextEncoder ../../include/QtCore/QTextDecoder ../../include/QtCore/QTextCodecFactoryInterface ../../include/QtCore/QTextCodecPlugin ../../include/QtCore/QtAlgorithms ../../include/QtCore/QBitArray ../../include/QtCore/QBitRef ../../include/QtCore/QByteArray ../../include/QtCore/QByteRef ../../include/QtCore/QByteArrayMatcher ../../include/QtCore/QCache ../../include/QtCore/QLatin1Char ../../include/QtCore/QChar ../../include/QtCore/QtContainerFwd ../../include/QtCore/QContiguousCacheData ../../include/QtCore/QContiguousCacheTypedData ../../include/QtCore/QContiguousCache ../../include/QtCore/QCryptographicHash ../../include/QtCore/QDate ../../include/QtCore/QTime ../../include/QtCore/QDateTime ../../include/QtCore/QEasingCurve ../../include/QtCore/QHashData ../../include/QtCore/QHashDummyValue ../../include/QtCore/QHashDummyNode ../../include/QtCore/QHashNode ../../include/QtCore/QHash ../../include/QtCore/QMultiHash ../../include/QtCore/QHashIterator ../../include/QtCore/QMutableHashIterator ../../include/QtCore/QLine ../../include/QtCore/QLineF ../../include/QtCore/QLinkedListData ../../include/QtCore/QLinkedListNode ../../include/QtCore/QLinkedList ../../include/QtCore/QLinkedListIterator ../../include/QtCore/QMutableLinkedListIterator ../../include/QtCore/QListData ../../include/QtCore/QList ../../include/QtCore/QListIterator ../../include/QtCore/QMutableListIterator ../../include/QtCore/QSystemLocale ../../include/QtCore/QLocale ../../include/QtCore/QMapData ../../include/QtCore/QMapNode ../../include/QtCore/QMapPayloadNode ../../include/QtCore/QMap ../../include/QtCore/QMultiMap ../../include/QtCore/QMapIterator ../../include/QtCore/QMutableMapIterator ../../include/QtCore/QMargins ../../include/QtCore/QPair ../../include/QtCore/QPoint ../../include/QtCore/QPointF ../../include/QtCore/QQueue ../../include/QtCore/QRect ../../include/QtCore/QRectF ../../include/QtCore/QRegExp ../../include/QtCore/QScopedPointerDeleter ../../include/QtCore/QScopedPointerArrayDeleter ../../include/QtCore/QScopedPointerPodDeleter ../../include/QtCore/QScopedPointer ../../include/QtCore/QScopedArrayPointer ../../include/QtCore/QSet ../../include/QtCore/QSetIterator ../../include/QtCore/QMutableSetIterator ../../include/QtCore/QSharedData ../../include/QtCore/QSharedDataPointer ../../include/QtCore/QExplicitlySharedDataPointer ../../include/QtCore/QSharedPointer ../../include/QtCore/QWeakPointer ../../include/QtCore/QSize ../../include/QtCore/QSizeF ../../include/QtCore/QStack ../../include/QtCore/QStdWString ../../include/QtCore/QString ../../include/QtCore/QLatin1String ../../include/QtCore/QCharRef ../../include/QtCore/QConstString ../../include/QtCore/QStringRef ../../include/QtCore/QLatin1Literal ../../include/QtCore/QAbstractConcatenable ../../include/QtCore/QConcatenable ../../include/QtCore/QStringBuilder ../../include/QtCore/QStringListIterator ../../include/QtCore/QMutableStringListIterator ../../include/QtCore/QStringList ../../include/QtCore/QStringMatcher ../../include/QtCore/QTextBoundaryFinder ../../include/QtCore/QTimeLine ../../include/QtCore/QVarLengthArray ../../include/QtCore/QVectorData ../../include/QtCore/QVectorTypedData ../../include/QtCore/QVector ../../include/QtCore/QVectorIterator ../../include/QtCore/QMutableVectorIterator ../../include/QtCore/QtEndian ../../include/QtCore/QtGlobal ../../include/QtCore/QIntegerForSize ../../include/QtCore/QNoImplicitBoolCast ../../include/QtCore/Q_INT8 ../../include/QtCore/Q_UINT8 ../../include/QtCore/Q_INT16 ../../include/QtCore/Q_UINT16 ../../include/QtCore/Q_INT32 ../../include/QtCore/Q_UINT32 ../../include/QtCore/Q_INT64 ../../include/QtCore/Q_UINT64 ../../include/QtCore/Q_LLONG ../../include/QtCore/Q_ULLONG ../../include/QtCore/Q_LONG ../../include/QtCore/Q_ULONG ../../include/QtCore/QSysInfo ../../include/QtCore/QtMsgHandler ../../include/QtCore/QGlobalStatic ../../include/QtCore/QGlobalStaticDeleter ../../include/QtCore/QBool ../../include/QtCore/QTypeInfo ../../include/QtCore/QFlag ../../include/QtCore/QIncompatibleFlag ../../include/QtCore/QFlags ../../include/QtCore/QForeachContainer ../../include/QtCore/QForeachContainerBase ../../include/QtCore/QLibraryInfo ../../include/QtCore/Qt ../../include/QtCore/QInternal ../../include/QtCore/QCOORD ../../include/QtCore/QAbstractEventDispatcher ../../include/QtCore/QModelIndex ../../include/QtCore/QPersistentModelIndex ../../include/QtCore/QModelIndexList ../../include/QtCore/QAbstractItemModel ../../include/QtCore/QAbstractTableModel ../../include/QtCore/QAbstractListModel ../../include/QtCore/QBasicTimer ../../include/QtCore/QCoreApplication ../../include/QtCore/QtCleanUpFunction ../../include/QtCore/QEvent ../../include/QtCore/QTimerEvent ../../include/QtCore/QChildEvent ../../include/QtCore/QCustomEvent ../../include/QtCore/QDynamicPropertyChangeEvent ../../include/QtCore/QEventLoop ../../include/QtCore/QMetaMethod ../../include/QtCore/QMetaEnum ../../include/QtCore/QMetaProperty ../../include/QtCore/QMetaClassInfo ../../include/QtCore/QMetaType ../../include/QtCore/QMetaTypeId ../../include/QtCore/QMetaTypeId2 ../../include/QtCore/QMimeData ../../include/QtCore/QObjectList ../../include/QtCore/QObjectData ../../include/QtCore/QObject ../../include/QtCore/QObjectUserData ../../include/QtCore/QObjectCleanupHandler ../../include/QtCore/QGenericArgument ../../include/QtCore/QGenericReturnArgument ../../include/QtCore/QArgument ../../include/QtCore/QReturnArgument ../../include/QtCore/QMetaObject ../../include/QtCore/QMetaObjectAccessor ../../include/QtCore/QMetaObjectExtraData ../../include/QtCore/QPointer ../../include/QtCore/QSharedMemory ../../include/QtCore/QSignalMapper ../../include/QtCore/QSocketNotifier ../../include/QtCore/QSystemSemaphore ../../include/QtCore/QTimer ../../include/QtCore/QTranslator ../../include/QtCore/QVariant ../../include/QtCore/QVariantList ../../include/QtCore/QVariantMap ../../include/QtCore/QVariantHash ../../include/QtCore/QVariantComparisonHelper ../../include/QtCore/QFuture ../../include/QtCore/QFutureIterator ../../include/QtCore/QMutableFutureIterator ../../include/QtCore/QFutureInterfaceBase ../../include/QtCore/QFutureInterface ../../include/QtCore/QFutureSynchronizer ../../include/QtCore/QFutureWatcherBase ../../include/QtCore/QFutureWatcher ../../include/QtCore/QRunnable ../../include/QtCore/QtConcurrentFilter ../../include/QtCore/QtConcurrentMap ../../include/QtCore/QtConcurrentRun ../../include/QtCore/QThreadPool ../../include/QtCore/QFactoryInterface ../../include/QtCore/QLibrary ../../include/QtCore/QtPlugin ../../include/QtCore/QtPluginInstanceFunction ../../include/QtCore/QPluginLoader ../../include/QtCore/QUuid ../../include/QtCore/QAtomicInt ../../include/QtCore/QAtomicPointer ../../include/QtCore/QBasicAtomicInt ../../include/QtCore/QBasicAtomicPointer ../../include/QtCore/QMutex ../../include/QtCore/QMutexLocker ../../include/QtCore/QReadWriteLock ../../include/QtCore/QReadLocker ../../include/QtCore/QWriteLocker ../../include/QtCore/QSemaphore ../../include/QtCore/QThread ../../include/QtCore/QThreadStorageData ../../include/QtCore/QThreadStorage ../../include/QtCore/QWaitCondition ../../include/QtCore/QAbstractState ../../include/QtCore/QAbstractTransition ../../include/QtCore/QEventTransition ../../include/QtCore/QFinalState ../../include/QtCore/QHistoryState ../../include/QtCore/QSignalTransition ../../include/QtCore/QState ../../include/QtCore/QStateMachine ../../include/QtCore/QAbstractAnimation ../../include/QtCore/QAnimationGroup ../../include/QtCore/QParallelAnimationGroup ../../include/QtCore/QPauseAnimation ../../include/QtCore/QPropertyAnimation ../../include/QtCore/QSequentialAnimationGroup ../../include/QtCore/QVariantAnimation 
-SYNCQT.PRIVATE_HEADER_FILES = ../corelib/xml/qxmlstream_p.h ../corelib/xml/qxmlutils_p.h ../corelib/io/qabstractfileengine_p.h ../corelib/io/qdatastream_p.h ../corelib/io/qfile_p.h ../corelib/io/qfileinfo_p.h ../corelib/io/qfilesystemwatcher_dnotify_p.h ../corelib/io/qfilesystemwatcher_fsevents_p.h ../corelib/io/qfilesystemwatcher_inotify_p.h ../corelib/io/qfilesystemwatcher_kqueue_p.h ../corelib/io/qfilesystemwatcher_p.h ../corelib/io/qfilesystemwatcher_symbian_p.h ../corelib/io/qfilesystemwatcher_win_p.h ../corelib/io/qfsfileengine_iterator_p.h ../corelib/io/qfsfileengine_p.h ../corelib/io/qiodevice_p.h ../corelib/io/qnoncontiguousbytedevice_p.h ../corelib/io/qprocess_p.h ../corelib/io/qresource_iterator_p.h ../corelib/io/qresource_p.h ../corelib/io/qsettings_p.h ../corelib/io/qwindowspipewriter_p.h ../corelib/codecs/qfontlaocodec_p.h ../corelib/codecs/qiconvcodec_p.h ../corelib/codecs/qisciicodec_p.h ../corelib/codecs/qlatincodec_p.h ../corelib/codecs/qsimplecodec_p.h ../corelib/codecs/qtextcodec_p.h ../corelib/codecs/qtsciicodec_p.h ../corelib/codecs/qutfcodec_p.h ../corelib/tools/qbytedata_p.h ../corelib/tools/qdatetime_p.h ../corelib/tools/qharfbuzz_p.h ../corelib/tools/qlocale_data_p.h ../corelib/tools/qlocale_p.h ../corelib/tools/qpodlist_p.h ../corelib/tools/qringbuffer_p.h ../corelib/tools/qscopedpointer_p.h ../corelib/tools/qtools_p.h ../corelib/tools/qunicodetables_p.h ../corelib/global/qnumeric_p.h ../corelib/global/qt_pch.h ../corelib/kernel/qabstracteventdispatcher_p.h ../corelib/kernel/qabstractitemmodel_p.h ../corelib/kernel/qcore_mac_p.h ../corelib/kernel/qcore_symbian_p.h ../corelib/kernel/qcore_unix_p.h ../corelib/kernel/qcoreapplication_p.h ../corelib/kernel/qcorecmdlineargs_p.h ../corelib/kernel/qcoreglobaldata_p.h ../corelib/kernel/qcrashhandler_p.h ../corelib/kernel/qeventdispatcher_glib_p.h ../corelib/kernel/qeventdispatcher_symbian_p.h ../corelib/kernel/qeventdispatcher_unix_p.h ../corelib/kernel/qeventdispatcher_win_p.h ../corelib/kernel/qfunctions_p.h ../corelib/kernel/qguard_p.h ../corelib/kernel/qmetaobject_p.h ../corelib/kernel/qobject_p.h ../corelib/kernel/qsharedmemory_p.h ../corelib/kernel/qsystemsemaphore_p.h ../corelib/kernel/qtranslator_p.h ../corelib/kernel/qvariant_p.h ../corelib/kernel/qwineventnotifier_p.h ../corelib/concurrent/qfutureinterface_p.h ../corelib/concurrent/qfuturewatcher_p.h ../corelib/concurrent/qthreadpool_p.h ../corelib/plugin/qfactoryloader_p.h ../corelib/plugin/qlibrary_p.h ../corelib/thread/qmutex_p.h ../corelib/thread/qmutexpool_p.h ../corelib/thread/qorderedmutexlocker_p.h ../corelib/thread/qreadwritelock_p.h ../corelib/thread/qthread_p.h ../corelib/statemachine/qabstractstate_p.h ../corelib/statemachine/qabstracttransition_p.h ../corelib/statemachine/qeventtransition_p.h ../corelib/statemachine/qhistorystate_p.h ../corelib/statemachine/qsignaleventgenerator_p.h ../corelib/statemachine/qsignaltransition_p.h ../corelib/statemachine/qstate_p.h ../corelib/statemachine/qstatemachine_p.h ../corelib/animation/qabstractanimation_p.h ../corelib/animation/qanimationgroup_p.h ../corelib/animation/qparallelanimationgroup_p.h ../corelib/animation/qpropertyanimation_p.h ../corelib/animation/qsequentialanimationgroup_p.h ../corelib/animation/qvariantanimation_p.h 
+SYNCQT.HEADER_FILES = ../corelib/statemachine/qabstractstate.h ../corelib/statemachine/qabstracttransition.h ../corelib/statemachine/qeventtransition.h ../corelib/statemachine/qfinalstate.h ../corelib/statemachine/qhistorystate.h ../corelib/statemachine/qsignaltransition.h ../corelib/statemachine/qstate.h ../corelib/statemachine/qstatemachine.h ../corelib/kernel/qabstracteventdispatcher.h ../corelib/kernel/qabstractitemmodel.h ../corelib/kernel/qbasictimer.h ../corelib/kernel/qcoreapplication.h ../corelib/kernel/qcoreevent.h ../corelib/kernel/qeventloop.h ../corelib/kernel/qfunctions_vxworks.h ../corelib/kernel/qfunctions_wince.h ../corelib/kernel/qmath.h ../corelib/kernel/qmetaobject.h ../corelib/kernel/qmetatype.h ../corelib/kernel/qmimedata.h ../corelib/kernel/qobject.h ../corelib/kernel/qobjectcleanuphandler.h ../corelib/kernel/qobjectdefs.h ../corelib/kernel/qpointer.h ../corelib/kernel/qsharedmemory.h ../corelib/kernel/qsignalmapper.h ../corelib/kernel/qsocketnotifier.h ../corelib/kernel/qsystemsemaphore.h ../corelib/kernel/qtimer.h ../corelib/kernel/qtranslator.h ../corelib/kernel/qvariant.h ../corelib/codecs/qtextcodec.h ../corelib/codecs/qtextcodecplugin.h ../corelib/animation/qabstractanimation.h ../corelib/animation/qanimationgroup.h ../corelib/animation/qparallelanimationgroup.h ../corelib/animation/qpauseanimation.h ../corelib/animation/qpropertyanimation.h ../corelib/animation/qsequentialanimationgroup.h ../corelib/animation/qvariantanimation.h ../corelib/global/qconfig-dist.h ../corelib/global/qconfig-large.h ../corelib/global/qconfig-medium.h ../corelib/global/qconfig-minimal.h ../corelib/global/qconfig-small.h ../corelib/global/qendian.h ../corelib/global/qfeatures.h ../corelib/global/qglobal.h ../corelib/global/qlibraryinfo.h ../corelib/global/qnamespace.h ../corelib/global/qnumeric.h ../corelib/global/qt_windows.h ../corelib/plugin/qfactoryinterface.h ../corelib/plugin/qlibrary.h ../corelib/plugin/qplugin.h ../corelib/plugin/qpluginloader.h ../corelib/plugin/quuid.h ../corelib/thread/qatomic.h ../corelib/thread/qbasicatomic.h ../corelib/thread/qmutex.h ../corelib/thread/qreadwritelock.h ../corelib/thread/qsemaphore.h ../corelib/thread/qthread.h ../corelib/thread/qthreadstorage.h ../corelib/thread/qwaitcondition.h ../corelib/xml/qxmlstream.h ../corelib/concurrent/qfuture.h ../corelib/concurrent/qfutureinterface.h ../corelib/concurrent/qfuturesynchronizer.h ../corelib/concurrent/qfuturewatcher.h ../corelib/concurrent/qrunnable.h ../corelib/concurrent/qtconcurrentcompilertest.h ../corelib/concurrent/qtconcurrentexception.h ../corelib/concurrent/qtconcurrentfilter.h ../corelib/concurrent/qtconcurrentfilterkernel.h ../corelib/concurrent/qtconcurrentfunctionwrappers.h ../corelib/concurrent/qtconcurrentiteratekernel.h ../corelib/concurrent/qtconcurrentmap.h ../corelib/concurrent/qtconcurrentmapkernel.h ../corelib/concurrent/qtconcurrentmedian.h ../corelib/concurrent/qtconcurrentreducekernel.h ../corelib/concurrent/qtconcurrentresultstore.h ../corelib/concurrent/qtconcurrentrun.h ../corelib/concurrent/qtconcurrentrunbase.h ../corelib/concurrent/qtconcurrentstoredfunctioncall.h ../corelib/concurrent/qtconcurrentthreadengine.h ../corelib/concurrent/qthreadpool.h ../corelib/tools/qalgorithms.h ../corelib/tools/qbitarray.h ../corelib/tools/qbytearray.h ../corelib/tools/qbytearraymatcher.h ../corelib/tools/qcache.h ../corelib/tools/qchar.h ../corelib/tools/qcontainerfwd.h ../corelib/tools/qcontiguouscache.h ../corelib/tools/qcryptographichash.h ../corelib/tools/qdatetime.h ../corelib/tools/qeasingcurve.h ../corelib/tools/qhash.h ../corelib/tools/qiterator.h ../corelib/tools/qline.h ../corelib/tools/qlinkedlist.h ../corelib/tools/qlist.h ../corelib/tools/qlocale.h ../corelib/tools/qmap.h ../corelib/tools/qmargins.h ../corelib/tools/qpair.h ../corelib/tools/qpoint.h ../corelib/tools/qqueue.h ../corelib/tools/qrect.h ../corelib/tools/qregexp.h ../corelib/tools/qscopedpointer.h ../corelib/tools/qset.h ../corelib/tools/qshareddata.h ../corelib/tools/qsharedpointer.h ../corelib/tools/qsharedpointer_impl.h ../corelib/tools/qsize.h ../corelib/tools/qstack.h ../corelib/tools/qstring.h ../corelib/tools/qstringbuilder.h ../corelib/tools/qstringlist.h ../corelib/tools/qstringmatcher.h ../corelib/tools/qtextboundaryfinder.h ../corelib/tools/qtimeline.h ../corelib/tools/qvarlengtharray.h ../corelib/tools/qvector.h ../corelib/arch/qatomic_alpha.h ../corelib/arch/qatomic_arch.h ../corelib/arch/qatomic_arm.h ../corelib/arch/qatomic_armv6.h ../corelib/arch/qatomic_avr32.h ../corelib/arch/qatomic_bfin.h ../corelib/arch/qatomic_bootstrap.h ../corelib/arch/qatomic_generic.h ../corelib/arch/qatomic_i386.h ../corelib/arch/qatomic_ia64.h ../corelib/arch/qatomic_macosx.h ../corelib/arch/qatomic_mips.h ../corelib/arch/qatomic_parisc.h ../corelib/arch/qatomic_powerpc.h ../corelib/arch/qatomic_s390.h ../corelib/arch/qatomic_sh.h ../corelib/arch/qatomic_sh4a.h ../corelib/arch/qatomic_sparc.h ../corelib/arch/qatomic_symbian.h ../corelib/arch/qatomic_vxworks.h ../corelib/arch/qatomic_windows.h ../corelib/arch/qatomic_windowsce.h ../corelib/arch/qatomic_x86_64.h ../corelib/io/qabstractfileengine.h ../corelib/io/qbuffer.h ../corelib/io/qdatastream.h ../corelib/io/qdebug.h ../corelib/io/qdir.h ../corelib/io/qdiriterator.h ../corelib/io/qfile.h ../corelib/io/qfileinfo.h ../corelib/io/qfilesystemwatcher.h ../corelib/io/qfsfileengine.h ../corelib/io/qiodevice.h ../corelib/io/qprocess.h ../corelib/io/qresource.h ../corelib/io/qsettings.h ../corelib/io/qtemporaryfile.h ../corelib/io/qtextstream.h ../corelib/io/qurl.h ../../include/QtCore/QtCore 
+SYNCQT.HEADER_CLASSES = ../../include/QtCore/QAbstractState ../../include/QtCore/QAbstractTransition ../../include/QtCore/QEventTransition ../../include/QtCore/QFinalState ../../include/QtCore/QHistoryState ../../include/QtCore/QSignalTransition ../../include/QtCore/QState ../../include/QtCore/QStateMachine ../../include/QtCore/QAbstractEventDispatcher ../../include/QtCore/QModelIndex ../../include/QtCore/QPersistentModelIndex ../../include/QtCore/QModelIndexList ../../include/QtCore/QAbstractItemModel ../../include/QtCore/QAbstractTableModel ../../include/QtCore/QAbstractListModel ../../include/QtCore/QBasicTimer ../../include/QtCore/QCoreApplication ../../include/QtCore/QtCleanUpFunction ../../include/QtCore/QEvent ../../include/QtCore/QTimerEvent ../../include/QtCore/QChildEvent ../../include/QtCore/QCustomEvent ../../include/QtCore/QDynamicPropertyChangeEvent ../../include/QtCore/QEventLoop ../../include/QtCore/QMetaMethod ../../include/QtCore/QMetaEnum ../../include/QtCore/QMetaProperty ../../include/QtCore/QMetaClassInfo ../../include/QtCore/QMetaType ../../include/QtCore/QMetaTypeId ../../include/QtCore/QMetaTypeId2 ../../include/QtCore/QMimeData ../../include/QtCore/QObjectList ../../include/QtCore/QObjectData ../../include/QtCore/QObject ../../include/QtCore/QObjectUserData ../../include/QtCore/QObjectCleanupHandler ../../include/QtCore/QGenericArgument ../../include/QtCore/QGenericReturnArgument ../../include/QtCore/QArgument ../../include/QtCore/QReturnArgument ../../include/QtCore/QMetaObject ../../include/QtCore/QMetaObjectAccessor ../../include/QtCore/QMetaObjectExtraData ../../include/QtCore/QPointer ../../include/QtCore/QSharedMemory ../../include/QtCore/QSignalMapper ../../include/QtCore/QSocketNotifier ../../include/QtCore/QSystemSemaphore ../../include/QtCore/QTimer ../../include/QtCore/QTranslator ../../include/QtCore/QVariant ../../include/QtCore/QVariantList ../../include/QtCore/QVariantMap ../../include/QtCore/QVariantHash ../../include/QtCore/QVariantComparisonHelper ../../include/QtCore/QTextCodec ../../include/QtCore/QTextEncoder ../../include/QtCore/QTextDecoder ../../include/QtCore/QTextCodecFactoryInterface ../../include/QtCore/QTextCodecPlugin ../../include/QtCore/QAbstractAnimation ../../include/QtCore/QAnimationGroup ../../include/QtCore/QParallelAnimationGroup ../../include/QtCore/QPauseAnimation ../../include/QtCore/QPropertyAnimation ../../include/QtCore/QSequentialAnimationGroup ../../include/QtCore/QVariantAnimation ../../include/QtCore/QtEndian ../../include/QtCore/QtGlobal ../../include/QtCore/QIntegerForSize ../../include/QtCore/QNoImplicitBoolCast ../../include/QtCore/Q_INT8 ../../include/QtCore/Q_UINT8 ../../include/QtCore/Q_INT16 ../../include/QtCore/Q_UINT16 ../../include/QtCore/Q_INT32 ../../include/QtCore/Q_UINT32 ../../include/QtCore/Q_INT64 ../../include/QtCore/Q_UINT64 ../../include/QtCore/Q_LLONG ../../include/QtCore/Q_ULLONG ../../include/QtCore/Q_LONG ../../include/QtCore/Q_ULONG ../../include/QtCore/QSysInfo ../../include/QtCore/QtMsgHandler ../../include/QtCore/QGlobalStatic ../../include/QtCore/QGlobalStaticDeleter ../../include/QtCore/QBool ../../include/QtCore/QTypeInfo ../../include/QtCore/QFlag ../../include/QtCore/QIncompatibleFlag ../../include/QtCore/QFlags ../../include/QtCore/QForeachContainer ../../include/QtCore/QForeachContainerBase ../../include/QtCore/QLibraryInfo ../../include/QtCore/Qt ../../include/QtCore/QInternal ../../include/QtCore/QCOORD ../../include/QtCore/QFactoryInterface ../../include/QtCore/QLibrary ../../include/QtCore/QtPlugin ../../include/QtCore/QtPluginInstanceFunction ../../include/QtCore/QPluginLoader ../../include/QtCore/QUuid ../../include/QtCore/QAtomicInt ../../include/QtCore/QAtomicPointer ../../include/QtCore/QBasicAtomicInt ../../include/QtCore/QBasicAtomicPointer ../../include/QtCore/QMutex ../../include/QtCore/QMutexLocker ../../include/QtCore/QReadWriteLock ../../include/QtCore/QReadLocker ../../include/QtCore/QWriteLocker ../../include/QtCore/QSemaphore ../../include/QtCore/QThread ../../include/QtCore/QThreadStorageData ../../include/QtCore/QThreadStorage ../../include/QtCore/QWaitCondition ../../include/QtCore/QXmlStreamStringRef ../../include/QtCore/QXmlStreamAttribute ../../include/QtCore/QXmlStreamAttributes ../../include/QtCore/QXmlStreamNamespaceDeclaration ../../include/QtCore/QXmlStreamNamespaceDeclarations ../../include/QtCore/QXmlStreamNotationDeclaration ../../include/QtCore/QXmlStreamNotationDeclarations ../../include/QtCore/QXmlStreamEntityDeclaration ../../include/QtCore/QXmlStreamEntityDeclarations ../../include/QtCore/QXmlStreamEntityResolver ../../include/QtCore/QXmlStreamReader ../../include/QtCore/QXmlStreamWriter ../../include/QtCore/QFuture ../../include/QtCore/QFutureIterator ../../include/QtCore/QMutableFutureIterator ../../include/QtCore/QFutureInterfaceBase ../../include/QtCore/QFutureInterface ../../include/QtCore/QFutureSynchronizer ../../include/QtCore/QFutureWatcherBase ../../include/QtCore/QFutureWatcher ../../include/QtCore/QRunnable ../../include/QtCore/QtConcurrentFilter ../../include/QtCore/QtConcurrentMap ../../include/QtCore/QtConcurrentRun ../../include/QtCore/QThreadPool ../../include/QtCore/QtAlgorithms ../../include/QtCore/QBitArray ../../include/QtCore/QBitRef ../../include/QtCore/QByteArray ../../include/QtCore/QByteRef ../../include/QtCore/QByteArrayMatcher ../../include/QtCore/QCache ../../include/QtCore/QLatin1Char ../../include/QtCore/QChar ../../include/QtCore/QtContainerFwd ../../include/QtCore/QContiguousCacheData ../../include/QtCore/QContiguousCacheTypedData ../../include/QtCore/QContiguousCache ../../include/QtCore/QCryptographicHash ../../include/QtCore/QDate ../../include/QtCore/QTime ../../include/QtCore/QDateTime ../../include/QtCore/QEasingCurve ../../include/QtCore/QHashData ../../include/QtCore/QHashDummyValue ../../include/QtCore/QHashDummyNode ../../include/QtCore/QHashNode ../../include/QtCore/QHash ../../include/QtCore/QMultiHash ../../include/QtCore/QHashIterator ../../include/QtCore/QMutableHashIterator ../../include/QtCore/QLine ../../include/QtCore/QLineF ../../include/QtCore/QLinkedListData ../../include/QtCore/QLinkedListNode ../../include/QtCore/QLinkedList ../../include/QtCore/QLinkedListIterator ../../include/QtCore/QMutableLinkedListIterator ../../include/QtCore/QListData ../../include/QtCore/QList ../../include/QtCore/QListIterator ../../include/QtCore/QMutableListIterator ../../include/QtCore/QSystemLocale ../../include/QtCore/QLocale ../../include/QtCore/QMapData ../../include/QtCore/QMapNode ../../include/QtCore/QMapPayloadNode ../../include/QtCore/QMap ../../include/QtCore/QMultiMap ../../include/QtCore/QMapIterator ../../include/QtCore/QMutableMapIterator ../../include/QtCore/QMargins ../../include/QtCore/QPair ../../include/QtCore/QPoint ../../include/QtCore/QPointF ../../include/QtCore/QQueue ../../include/QtCore/QRect ../../include/QtCore/QRectF ../../include/QtCore/QRegExp ../../include/QtCore/QScopedPointerDeleter ../../include/QtCore/QScopedPointerArrayDeleter ../../include/QtCore/QScopedPointerPodDeleter ../../include/QtCore/QScopedPointer ../../include/QtCore/QScopedArrayPointer ../../include/QtCore/QSet ../../include/QtCore/QSetIterator ../../include/QtCore/QMutableSetIterator ../../include/QtCore/QSharedData ../../include/QtCore/QSharedDataPointer ../../include/QtCore/QExplicitlySharedDataPointer ../../include/QtCore/QSharedPointer ../../include/QtCore/QWeakPointer ../../include/QtCore/QSize ../../include/QtCore/QSizeF ../../include/QtCore/QStack ../../include/QtCore/QStdWString ../../include/QtCore/QString ../../include/QtCore/QLatin1String ../../include/QtCore/QCharRef ../../include/QtCore/QConstString ../../include/QtCore/QStringRef ../../include/QtCore/QLatin1Literal ../../include/QtCore/QAbstractConcatenable ../../include/QtCore/QConcatenable ../../include/QtCore/QStringBuilder ../../include/QtCore/QStringListIterator ../../include/QtCore/QMutableStringListIterator ../../include/QtCore/QStringList ../../include/QtCore/QStringMatcher ../../include/QtCore/QTextBoundaryFinder ../../include/QtCore/QTimeLine ../../include/QtCore/QVarLengthArray ../../include/QtCore/QVectorData ../../include/QtCore/QVectorTypedData ../../include/QtCore/QVector ../../include/QtCore/QVectorIterator ../../include/QtCore/QMutableVectorIterator ../../include/QtCore/QAbstractFileEngine ../../include/QtCore/QAbstractFileEngineHandler ../../include/QtCore/QAbstractFileEngineIterator ../../include/QtCore/QBuffer ../../include/QtCore/QDataStream ../../include/QtCore/QtDebug ../../include/QtCore/QDebug ../../include/QtCore/QNoDebug ../../include/QtCore/QDir ../../include/QtCore/QDirIterator ../../include/QtCore/QFile ../../include/QtCore/QFileInfo ../../include/QtCore/QFileInfoList ../../include/QtCore/QFileInfoListIterator ../../include/QtCore/QFileSystemWatcher ../../include/QtCore/QFSFileEngine ../../include/QtCore/QIODevice ../../include/QtCore/Q_PID ../../include/QtCore/QProcessEnvironment ../../include/QtCore/QProcess ../../include/QtCore/QResource ../../include/QtCore/QSettings ../../include/QtCore/QTemporaryFile ../../include/QtCore/QTextStream ../../include/QtCore/QTextStreamFunction ../../include/QtCore/QTextStreamManipulator ../../include/QtCore/QTS ../../include/QtCore/QTextIStream ../../include/QtCore/QTextOStream ../../include/QtCore/QUrl 
+SYNCQT.PRIVATE_HEADER_FILES = ../corelib/statemachine/qabstractstate_p.h ../corelib/statemachine/qabstracttransition_p.h ../corelib/statemachine/qeventtransition_p.h ../corelib/statemachine/qhistorystate_p.h ../corelib/statemachine/qsignaleventgenerator_p.h ../corelib/statemachine/qsignaltransition_p.h ../corelib/statemachine/qstate_p.h ../corelib/statemachine/qstatemachine_p.h ../corelib/kernel/qabstracteventdispatcher_p.h ../corelib/kernel/qabstractitemmodel_p.h ../corelib/kernel/qcore_mac_p.h ../corelib/kernel/qcore_symbian_p.h ../corelib/kernel/qcore_unix_p.h ../corelib/kernel/qcoreapplication_p.h ../corelib/kernel/qcorecmdlineargs_p.h ../corelib/kernel/qcoreglobaldata_p.h ../corelib/kernel/qcrashhandler_p.h ../corelib/kernel/qeventdispatcher_glib_p.h ../corelib/kernel/qeventdispatcher_symbian_p.h ../corelib/kernel/qeventdispatcher_unix_p.h ../corelib/kernel/qeventdispatcher_win_p.h ../corelib/kernel/qfunctions_p.h ../corelib/kernel/qguard_p.h ../corelib/kernel/qmetaobject_p.h ../corelib/kernel/qobject_p.h ../corelib/kernel/qsharedmemory_p.h ../corelib/kernel/qsystemsemaphore_p.h ../corelib/kernel/qtranslator_p.h ../corelib/kernel/qvariant_p.h ../corelib/kernel/qwineventnotifier_p.h ../corelib/codecs/qfontlaocodec_p.h ../corelib/codecs/qiconvcodec_p.h ../corelib/codecs/qisciicodec_p.h ../corelib/codecs/qlatincodec_p.h ../corelib/codecs/qsimplecodec_p.h ../corelib/codecs/qtextcodec_p.h ../corelib/codecs/qtsciicodec_p.h ../corelib/codecs/qutfcodec_p.h ../corelib/animation/qabstractanimation_p.h ../corelib/animation/qanimationgroup_p.h ../corelib/animation/qparallelanimationgroup_p.h ../corelib/animation/qpropertyanimation_p.h ../corelib/animation/qsequentialanimationgroup_p.h ../corelib/animation/qvariantanimation_p.h ../corelib/global/qnumeric_p.h ../corelib/global/qt_pch.h ../corelib/plugin/qfactoryloader_p.h ../corelib/plugin/qlibrary_p.h ../corelib/thread/qmutex_p.h ../corelib/thread/qmutexpool_p.h ../corelib/thread/qorderedmutexlocker_p.h ../corelib/thread/qreadwritelock_p.h ../corelib/thread/qthread_p.h ../corelib/xml/qxmlstream_p.h ../corelib/xml/qxmlutils_p.h ../corelib/concurrent/qfutureinterface_p.h ../corelib/concurrent/qfuturewatcher_p.h ../corelib/concurrent/qthreadpool_p.h ../corelib/tools/qbytedata_p.h ../corelib/tools/qdatetime_p.h ../corelib/tools/qharfbuzz_p.h ../corelib/tools/qlocale_data_p.h ../corelib/tools/qlocale_p.h ../corelib/tools/qpodlist_p.h ../corelib/tools/qringbuffer_p.h ../corelib/tools/qscopedpointer_p.h ../corelib/tools/qtools_p.h ../corelib/tools/qunicodetables_p.h ../corelib/io/qabstractfileengine_p.h ../corelib/io/qdatastream_p.h ../corelib/io/qfile_p.h ../corelib/io/qfileinfo_p.h ../corelib/io/qfilesystemwatcher_dnotify_p.h ../corelib/io/qfilesystemwatcher_fsevents_p.h ../corelib/io/qfilesystemwatcher_inotify_p.h ../corelib/io/qfilesystemwatcher_kqueue_p.h ../corelib/io/qfilesystemwatcher_p.h ../corelib/io/qfilesystemwatcher_symbian_p.h ../corelib/io/qfilesystemwatcher_win_p.h ../corelib/io/qfsfileengine_iterator_p.h ../corelib/io/qfsfileengine_p.h ../corelib/io/qiodevice_p.h ../corelib/io/qnoncontiguousbytedevice_p.h ../corelib/io/qprocess_p.h ../corelib/io/qresource_iterator_p.h ../corelib/io/qresource_p.h ../corelib/io/qsettings_p.h ../corelib/io/qwindowspipewriter_p.h 
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtCore/QtCore qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtCore/QtCore
--- qt-everywhere-opensource-src-4.6.2/include/QtCore/QtCore	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtCore/QtCore	2010-02-23 14:50:59.623613570 +0100
@@ -1,69 +1,13 @@
 #ifndef QT_QTCORE_MODULE_H
 #define QT_QTCORE_MODULE_H
-#include "qxmlstream.h"
-#include "qabstractfileengine.h"
-#include "qbuffer.h"
-#include "qdatastream.h"
-#include "qdebug.h"
-#include "qdir.h"
-#include "qdiriterator.h"
-#include "qfile.h"
-#include "qfileinfo.h"
-#include "qfilesystemwatcher.h"
-#include "qfsfileengine.h"
-#include "qiodevice.h"
-#include "qprocess.h"
-#include "qresource.h"
-#include "qsettings.h"
-#include "qtemporaryfile.h"
-#include "qtextstream.h"
-#include "qurl.h"
-#include "qtextcodec.h"
-#include "qtextcodecplugin.h"
-#include "qalgorithms.h"
-#include "qbitarray.h"
-#include "qbytearray.h"
-#include "qbytearraymatcher.h"
-#include "qcache.h"
-#include "qchar.h"
-#include "qcontainerfwd.h"
-#include "qcontiguouscache.h"
-#include "qcryptographichash.h"
-#include "qdatetime.h"
-#include "qeasingcurve.h"
-#include "qhash.h"
-#include "qiterator.h"
-#include "qline.h"
-#include "qlinkedlist.h"
-#include "qlist.h"
-#include "qlocale.h"
-#include "qmap.h"
-#include "qmargins.h"
-#include "qpair.h"
-#include "qpoint.h"
-#include "qqueue.h"
-#include "qrect.h"
-#include "qregexp.h"
-#include "qscopedpointer.h"
-#include "qset.h"
-#include "qshareddata.h"
-#include "qsharedpointer.h"
-#include "qsize.h"
-#include "qstack.h"
-#include "qstring.h"
-#include "qstringbuilder.h"
-#include "qstringlist.h"
-#include "qstringmatcher.h"
-#include "qtextboundaryfinder.h"
-#include "qtimeline.h"
-#include "qvarlengtharray.h"
-#include "qvector.h"
-#include "qendian.h"
-#include "qfeatures.h"
-#include "qglobal.h"
-#include "qlibraryinfo.h"
-#include "qnamespace.h"
-#include "qnumeric.h"
+#include "qabstractstate.h"
+#include "qabstracttransition.h"
+#include "qeventtransition.h"
+#include "qfinalstate.h"
+#include "qhistorystate.h"
+#include "qsignaltransition.h"
+#include "qstate.h"
+#include "qstatemachine.h"
 #include "qabstracteventdispatcher.h"
 #include "qabstractitemmodel.h"
 #include "qbasictimer.h"
@@ -85,6 +29,35 @@
 #include "qtimer.h"
 #include "qtranslator.h"
 #include "qvariant.h"
+#include "qtextcodec.h"
+#include "qtextcodecplugin.h"
+#include "qabstractanimation.h"
+#include "qanimationgroup.h"
+#include "qparallelanimationgroup.h"
+#include "qpauseanimation.h"
+#include "qpropertyanimation.h"
+#include "qsequentialanimationgroup.h"
+#include "qvariantanimation.h"
+#include "qendian.h"
+#include "qfeatures.h"
+#include "qglobal.h"
+#include "qlibraryinfo.h"
+#include "qnamespace.h"
+#include "qnumeric.h"
+#include "qfactoryinterface.h"
+#include "qlibrary.h"
+#include "qplugin.h"
+#include "qpluginloader.h"
+#include "quuid.h"
+#include "qatomic.h"
+#include "qbasicatomic.h"
+#include "qmutex.h"
+#include "qreadwritelock.h"
+#include "qsemaphore.h"
+#include "qthread.h"
+#include "qthreadstorage.h"
+#include "qwaitcondition.h"
+#include "qxmlstream.h"
 #include "qfuture.h"
 #include "qfutureinterface.h"
 #include "qfuturesynchronizer.h"
@@ -106,32 +79,59 @@
 #include "qtconcurrentstoredfunctioncall.h"
 #include "qtconcurrentthreadengine.h"
 #include "qthreadpool.h"
-#include "qfactoryinterface.h"
-#include "qlibrary.h"
-#include "qplugin.h"
-#include "qpluginloader.h"
-#include "quuid.h"
-#include "qatomic.h"
-#include "qbasicatomic.h"
-#include "qmutex.h"
-#include "qreadwritelock.h"
-#include "qsemaphore.h"
-#include "qthread.h"
-#include "qthreadstorage.h"
-#include "qwaitcondition.h"
-#include "qabstractstate.h"
-#include "qabstracttransition.h"
-#include "qeventtransition.h"
-#include "qfinalstate.h"
-#include "qhistorystate.h"
-#include "qsignaltransition.h"
-#include "qstate.h"
-#include "qstatemachine.h"
-#include "qabstractanimation.h"
-#include "qanimationgroup.h"
-#include "qparallelanimationgroup.h"
-#include "qpauseanimation.h"
-#include "qpropertyanimation.h"
-#include "qsequentialanimationgroup.h"
-#include "qvariantanimation.h"
+#include "qalgorithms.h"
+#include "qbitarray.h"
+#include "qbytearray.h"
+#include "qbytearraymatcher.h"
+#include "qcache.h"
+#include "qchar.h"
+#include "qcontainerfwd.h"
+#include "qcontiguouscache.h"
+#include "qcryptographichash.h"
+#include "qdatetime.h"
+#include "qeasingcurve.h"
+#include "qhash.h"
+#include "qiterator.h"
+#include "qline.h"
+#include "qlinkedlist.h"
+#include "qlist.h"
+#include "qlocale.h"
+#include "qmap.h"
+#include "qmargins.h"
+#include "qpair.h"
+#include "qpoint.h"
+#include "qqueue.h"
+#include "qrect.h"
+#include "qregexp.h"
+#include "qscopedpointer.h"
+#include "qset.h"
+#include "qshareddata.h"
+#include "qsharedpointer.h"
+#include "qsize.h"
+#include "qstack.h"
+#include "qstring.h"
+#include "qstringbuilder.h"
+#include "qstringlist.h"
+#include "qstringmatcher.h"
+#include "qtextboundaryfinder.h"
+#include "qtimeline.h"
+#include "qvarlengtharray.h"
+#include "qvector.h"
+#include "qabstractfileengine.h"
+#include "qbuffer.h"
+#include "qdatastream.h"
+#include "qdebug.h"
+#include "qdir.h"
+#include "qdiriterator.h"
+#include "qfile.h"
+#include "qfileinfo.h"
+#include "qfilesystemwatcher.h"
+#include "qfsfileengine.h"
+#include "qiodevice.h"
+#include "qprocess.h"
+#include "qresource.h"
+#include "qsettings.h"
+#include "qtemporaryfile.h"
+#include "qtextstream.h"
+#include "qurl.h"
 #endif
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtDesigner/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtDesigner/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/QtDesigner/headers.pri	2010-02-11 16:55:14.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtDesigner/headers.pri	2010-02-23 14:51:02.015613817 +0100
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../lib/components/qdesigner_components.h ../lib/components/qdesigner_components_global.h ../lib/extension/default_extensionfactory.h ../lib/extension/extension.h ../lib/extension/extension_global.h ../lib/extension/qextensionmanager.h ../lib/sdk/abstractactioneditor.h ../lib/sdk/abstractbrushmanager.h ../lib/sdk/abstractdnditem.h ../lib/sdk/abstractformeditor.h ../lib/sdk/abstractformeditorplugin.h ../lib/sdk/abstractformwindow.h ../lib/sdk/abstractformwindowcursor.h ../lib/sdk/abstractformwindowmanager.h ../lib/sdk/abstractformwindowtool.h ../lib/sdk/abstracticoncache.h ../lib/sdk/abstractintegration.h ../lib/sdk/abstractlanguage.h ../lib/sdk/abstractmetadatabase.h ../lib/sdk/abstractobjectinspector.h ../lib/sdk/abstractpromotioninterface.h ../lib/sdk/abstractpropertyeditor.h ../lib/sdk/abstractresourcebrowser.h ../lib/sdk/abstractwidgetbox.h ../lib/sdk/abstractwidgetdatabase.h ../lib/sdk/abstractwidgetfactory.h ../lib/sdk/dynamicpropertysheet.h ../lib/sdk/extrainfo.h ../lib/sdk/layoutdecoration.h ../lib/sdk/membersheet.h ../lib/sdk/propertysheet.h ../lib/sdk/sdk_global.h ../lib/sdk/taskmenu.h ../lib/uilib/abstractformbuilder.h ../lib/uilib/container.h ../lib/uilib/customwidget.h ../lib/uilib/formbuilder.h ../lib/uilib/qdesignerexportwidget.h ../lib/uilib/uilib_global.h ../../../../include/QtDesigner/QtDesigner 
-SYNCQT.HEADER_CLASSES = ../../../../include/QtDesigner/QDesignerComponents ../../../../include/QtDesigner/QExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionManager ../../../../include/QtDesigner/QExtensionManager ../../../../include/QtDesigner/QDesignerActionEditorInterface ../../../../include/QtDesigner/QDesignerBrushManagerInterface ../../../../include/QtDesigner/QDesignerDnDItemInterface ../../../../include/QtDesigner/QDesignerFormEditorInterface ../../../../include/QtDesigner/QDesignerFormEditorPluginInterface ../../../../include/QtDesigner/QDesignerFormWindowInterface ../../../../include/QtDesigner/QDesignerFormWindowCursorInterface ../../../../include/QtDesigner/QDesignerFormWindowManagerInterface ../../../../include/QtDesigner/QDesignerFormWindowToolInterface ../../../../include/QtDesigner/QDesignerIconCacheInterface ../../../../include/QtDesigner/QDesignerIntegrationInterface ../../../../include/QtDesigner/QDesignerLanguageExtension ../../../../include/QtDesigner/QDesignerMetaDataBaseItemInterface ../../../../include/QtDesigner/QDesignerMetaDataBaseInterface ../../../../include/QtDesigner/QDesignerObjectInspectorInterface ../../../../include/QtDesigner/QDesignerPromotionInterface ../../../../include/QtDesigner/QDesignerPropertyEditorInterface ../../../../include/QtDesigner/QDesignerResourceBrowserInterface ../../../../include/QtDesigner/QDesignerWidgetBoxInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseItemInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseInterface ../../../../include/QtDesigner/QDesignerWidgetFactoryInterface ../../../../include/QtDesigner/QDesignerDynamicPropertySheetExtension ../../../../include/QtDesigner/QDesignerExtraInfoExtension ../../../../include/QtDesigner/QDesignerLayoutDecorationExtension ../../../../include/QtDesigner/QDesignerMemberSheetExtension ../../../../include/QtDesigner/QDesignerPropertySheetExtension ../../../../include/QtDesigner/QDesignerTaskMenuExtension ../../../../include/QtDesigner/QAbstractFormBuilder ../../../../include/QtDesigner/QDesignerContainerExtension ../../../../include/QtDesigner/QDesignerCustomWidgetInterface ../../../../include/QtDesigner/QDesignerCustomWidgetCollectionInterface ../../../../include/QtDesigner/QFormBuilder ../../../../include/QtDesigner/QDesignerExportWidget 
-SYNCQT.PRIVATE_HEADER_FILES = lib_pch.h ../lib/shared/actioneditor_p.h ../lib/shared/actionprovider_p.h ../lib/shared/actionrepository_p.h ../lib/shared/codedialog_p.h ../lib/shared/connectionedit_p.h ../lib/shared/csshighlighter_p.h ../lib/shared/deviceprofile_p.h ../lib/shared/dialoggui_p.h ../lib/shared/extensionfactory_p.h ../lib/shared/filterwidget_p.h ../lib/shared/formlayoutmenu_p.h ../lib/shared/formwindowbase_p.h ../lib/shared/grid_p.h ../lib/shared/gridpanel_p.h ../lib/shared/htmlhighlighter_p.h ../lib/shared/iconloader_p.h ../lib/shared/iconselector_p.h ../lib/shared/invisible_widget_p.h ../lib/shared/layout_p.h ../lib/shared/layoutinfo_p.h ../lib/shared/metadatabase_p.h ../lib/shared/morphmenu_p.h ../lib/shared/newactiondialog_p.h ../lib/shared/newformwidget_p.h ../lib/shared/orderdialog_p.h ../lib/shared/plaintexteditor_p.h ../lib/shared/plugindialog_p.h ../lib/shared/pluginmanager_p.h ../lib/shared/previewconfigurationwidget_p.h ../lib/shared/previewmanager_p.h ../lib/shared/promotionmodel_p.h ../lib/shared/promotiontaskmenu_p.h ../lib/shared/propertylineedit_p.h ../lib/shared/qdesigner_command2_p.h ../lib/shared/qdesigner_command_p.h ../lib/shared/qdesigner_dnditem_p.h ../lib/shared/qdesigner_dockwidget_p.h ../lib/shared/qdesigner_formbuilder_p.h ../lib/shared/qdesigner_formeditorcommand_p.h ../lib/shared/qdesigner_formwindowcommand_p.h ../lib/shared/qdesigner_formwindowmanager_p.h ../lib/shared/qdesigner_integration_p.h ../lib/shared/qdesigner_introspection_p.h ../lib/shared/qdesigner_membersheet_p.h ../lib/shared/qdesigner_menu_p.h ../lib/shared/qdesigner_menubar_p.h ../lib/shared/qdesigner_objectinspector_p.h ../lib/shared/qdesigner_promotion_p.h ../lib/shared/qdesigner_promotiondialog_p.h ../lib/shared/qdesigner_propertycommand_p.h ../lib/shared/qdesigner_propertyeditor_p.h ../lib/shared/qdesigner_propertysheet_p.h ../lib/shared/qdesigner_qsettings_p.h ../lib/shared/qdesigner_stackedbox_p.h ../lib/shared/qdesigner_tabwidget_p.h ../lib/shared/qdesigner_taskmenu_p.h ../lib/shared/qdesigner_toolbar_p.h ../lib/shared/qdesigner_toolbox_p.h ../lib/shared/qdesigner_utils_p.h ../lib/shared/qdesigner_widget_p.h ../lib/shared/qdesigner_widgetbox_p.h ../lib/shared/qdesigner_widgetitem_p.h ../lib/shared/qlayout_widget_p.h ../lib/shared/qscripthighlighter_p.h ../lib/shared/qsimpleresource_p.h ../lib/shared/qtresourceeditordialog_p.h ../lib/shared/qtresourcemodel_p.h ../lib/shared/qtresourceview_p.h ../lib/shared/richtexteditor_p.h ../lib/shared/scriptcommand_p.h ../lib/shared/scriptdialog_p.h ../lib/shared/scripterrordialog_p.h ../lib/shared/shared_enums_p.h ../lib/shared/shared_global_p.h ../lib/shared/shared_settings_p.h ../lib/shared/sheet_delegate_p.h ../lib/shared/signalslotdialog_p.h ../lib/shared/spacer_widget_p.h ../lib/shared/stylesheeteditor_p.h ../lib/shared/textpropertyeditor_p.h ../lib/shared/widgetdatabase_p.h ../lib/shared/widgetfactory_p.h ../lib/shared/zoomwidget_p.h ../lib/sdk/abstractdialoggui_p.h ../lib/sdk/abstractintrospection_p.h ../lib/sdk/abstractnewformwidget_p.h ../lib/sdk/abstractoptionspage_p.h ../lib/sdk/abstractsettings_p.h ../lib/sdk/script_p.h ../lib/uilib/formbuilderextra_p.h ../lib/uilib/formscriptrunner_p.h ../lib/uilib/properties_p.h ../lib/uilib/resourcebuilder_p.h ../lib/uilib/textbuilder_p.h ../lib/uilib/ui4_p.h 
+SYNCQT.HEADER_FILES = ../lib/components/qdesigner_components.h ../lib/components/qdesigner_components_global.h ../lib/extension/default_extensionfactory.h ../lib/extension/extension.h ../lib/extension/extension_global.h ../lib/extension/qextensionmanager.h ../lib/uilib/abstractformbuilder.h ../lib/uilib/container.h ../lib/uilib/customwidget.h ../lib/uilib/formbuilder.h ../lib/uilib/qdesignerexportwidget.h ../lib/uilib/uilib_global.h ../lib/sdk/abstractactioneditor.h ../lib/sdk/abstractbrushmanager.h ../lib/sdk/abstractdnditem.h ../lib/sdk/abstractformeditor.h ../lib/sdk/abstractformeditorplugin.h ../lib/sdk/abstractformwindow.h ../lib/sdk/abstractformwindowcursor.h ../lib/sdk/abstractformwindowmanager.h ../lib/sdk/abstractformwindowtool.h ../lib/sdk/abstracticoncache.h ../lib/sdk/abstractintegration.h ../lib/sdk/abstractlanguage.h ../lib/sdk/abstractmetadatabase.h ../lib/sdk/abstractobjectinspector.h ../lib/sdk/abstractpromotioninterface.h ../lib/sdk/abstractpropertyeditor.h ../lib/sdk/abstractresourcebrowser.h ../lib/sdk/abstractwidgetbox.h ../lib/sdk/abstractwidgetdatabase.h ../lib/sdk/abstractwidgetfactory.h ../lib/sdk/dynamicpropertysheet.h ../lib/sdk/extrainfo.h ../lib/sdk/layoutdecoration.h ../lib/sdk/membersheet.h ../lib/sdk/propertysheet.h ../lib/sdk/sdk_global.h ../lib/sdk/taskmenu.h ../../../../include/QtDesigner/QtDesigner 
+SYNCQT.HEADER_CLASSES = ../../../../include/QtDesigner/QDesignerComponents ../../../../include/QtDesigner/QExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionManager ../../../../include/QtDesigner/QExtensionManager ../../../../include/QtDesigner/QAbstractFormBuilder ../../../../include/QtDesigner/QDesignerContainerExtension ../../../../include/QtDesigner/QDesignerCustomWidgetInterface ../../../../include/QtDesigner/QDesignerCustomWidgetCollectionInterface ../../../../include/QtDesigner/QFormBuilder ../../../../include/QtDesigner/QDesignerExportWidget ../../../../include/QtDesigner/QDesignerActionEditorInterface ../../../../include/QtDesigner/QDesignerBrushManagerInterface ../../../../include/QtDesigner/QDesignerDnDItemInterface ../../../../include/QtDesigner/QDesignerFormEditorInterface ../../../../include/QtDesigner/QDesignerFormEditorPluginInterface ../../../../include/QtDesigner/QDesignerFormWindowInterface ../../../../include/QtDesigner/QDesignerFormWindowCursorInterface ../../../../include/QtDesigner/QDesignerFormWindowManagerInterface ../../../../include/QtDesigner/QDesignerFormWindowToolInterface ../../../../include/QtDesigner/QDesignerIconCacheInterface ../../../../include/QtDesigner/QDesignerIntegrationInterface ../../../../include/QtDesigner/QDesignerLanguageExtension ../../../../include/QtDesigner/QDesignerMetaDataBaseItemInterface ../../../../include/QtDesigner/QDesignerMetaDataBaseInterface ../../../../include/QtDesigner/QDesignerObjectInspectorInterface ../../../../include/QtDesigner/QDesignerPromotionInterface ../../../../include/QtDesigner/QDesignerPropertyEditorInterface ../../../../include/QtDesigner/QDesignerResourceBrowserInterface ../../../../include/QtDesigner/QDesignerWidgetBoxInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseItemInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseInterface ../../../../include/QtDesigner/QDesignerWidgetFactoryInterface ../../../../include/QtDesigner/QDesignerDynamicPropertySheetExtension ../../../../include/QtDesigner/QDesignerExtraInfoExtension ../../../../include/QtDesigner/QDesignerLayoutDecorationExtension ../../../../include/QtDesigner/QDesignerMemberSheetExtension ../../../../include/QtDesigner/QDesignerPropertySheetExtension ../../../../include/QtDesigner/QDesignerTaskMenuExtension 
+SYNCQT.PRIVATE_HEADER_FILES = lib_pch.h ../lib/shared/actioneditor_p.h ../lib/shared/actionprovider_p.h ../lib/shared/actionrepository_p.h ../lib/shared/codedialog_p.h ../lib/shared/connectionedit_p.h ../lib/shared/csshighlighter_p.h ../lib/shared/deviceprofile_p.h ../lib/shared/dialoggui_p.h ../lib/shared/extensionfactory_p.h ../lib/shared/filterwidget_p.h ../lib/shared/formlayoutmenu_p.h ../lib/shared/formwindowbase_p.h ../lib/shared/grid_p.h ../lib/shared/gridpanel_p.h ../lib/shared/htmlhighlighter_p.h ../lib/shared/iconloader_p.h ../lib/shared/iconselector_p.h ../lib/shared/invisible_widget_p.h ../lib/shared/layout_p.h ../lib/shared/layoutinfo_p.h ../lib/shared/metadatabase_p.h ../lib/shared/morphmenu_p.h ../lib/shared/newactiondialog_p.h ../lib/shared/newformwidget_p.h ../lib/shared/orderdialog_p.h ../lib/shared/plaintexteditor_p.h ../lib/shared/plugindialog_p.h ../lib/shared/pluginmanager_p.h ../lib/shared/previewconfigurationwidget_p.h ../lib/shared/previewmanager_p.h ../lib/shared/promotionmodel_p.h ../lib/shared/promotiontaskmenu_p.h ../lib/shared/propertylineedit_p.h ../lib/shared/qdesigner_command2_p.h ../lib/shared/qdesigner_command_p.h ../lib/shared/qdesigner_dnditem_p.h ../lib/shared/qdesigner_dockwidget_p.h ../lib/shared/qdesigner_formbuilder_p.h ../lib/shared/qdesigner_formeditorcommand_p.h ../lib/shared/qdesigner_formwindowcommand_p.h ../lib/shared/qdesigner_formwindowmanager_p.h ../lib/shared/qdesigner_integration_p.h ../lib/shared/qdesigner_introspection_p.h ../lib/shared/qdesigner_membersheet_p.h ../lib/shared/qdesigner_menu_p.h ../lib/shared/qdesigner_menubar_p.h ../lib/shared/qdesigner_objectinspector_p.h ../lib/shared/qdesigner_promotion_p.h ../lib/shared/qdesigner_promotiondialog_p.h ../lib/shared/qdesigner_propertycommand_p.h ../lib/shared/qdesigner_propertyeditor_p.h ../lib/shared/qdesigner_propertysheet_p.h ../lib/shared/qdesigner_qsettings_p.h ../lib/shared/qdesigner_stackedbox_p.h ../lib/shared/qdesigner_tabwidget_p.h ../lib/shared/qdesigner_taskmenu_p.h ../lib/shared/qdesigner_toolbar_p.h ../lib/shared/qdesigner_toolbox_p.h ../lib/shared/qdesigner_utils_p.h ../lib/shared/qdesigner_widget_p.h ../lib/shared/qdesigner_widgetbox_p.h ../lib/shared/qdesigner_widgetitem_p.h ../lib/shared/qlayout_widget_p.h ../lib/shared/qscripthighlighter_p.h ../lib/shared/qsimpleresource_p.h ../lib/shared/qtresourceeditordialog_p.h ../lib/shared/qtresourcemodel_p.h ../lib/shared/qtresourceview_p.h ../lib/shared/richtexteditor_p.h ../lib/shared/scriptcommand_p.h ../lib/shared/scriptdialog_p.h ../lib/shared/scripterrordialog_p.h ../lib/shared/shared_enums_p.h ../lib/shared/shared_global_p.h ../lib/shared/shared_settings_p.h ../lib/shared/sheet_delegate_p.h ../lib/shared/signalslotdialog_p.h ../lib/shared/spacer_widget_p.h ../lib/shared/stylesheeteditor_p.h ../lib/shared/textpropertyeditor_p.h ../lib/shared/widgetdatabase_p.h ../lib/shared/widgetfactory_p.h ../lib/shared/zoomwidget_p.h ../lib/uilib/formbuilderextra_p.h ../lib/uilib/formscriptrunner_p.h ../lib/uilib/properties_p.h ../lib/uilib/resourcebuilder_p.h ../lib/uilib/textbuilder_p.h ../lib/uilib/ui4_p.h ../lib/sdk/abstractdialoggui_p.h ../lib/sdk/abstractintrospection_p.h ../lib/sdk/abstractnewformwidget_p.h ../lib/sdk/abstractoptionspage_p.h ../lib/sdk/abstractsettings_p.h ../lib/sdk/script_p.h 
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtDesigner/QtDesigner qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtDesigner/QtDesigner
--- qt-everywhere-opensource-src-4.6.2/include/QtDesigner/QtDesigner	2010-02-11 16:55:14.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtDesigner/QtDesigner	2010-02-23 14:47:28.104613727 +0100
@@ -3,6 +3,11 @@
 #include <QtXml/QtXml>
 #include "extension.h"
 #include "qextensionmanager.h"
+#include "abstractformbuilder.h"
+#include "container.h"
+#include "customwidget.h"
+#include "formbuilder.h"
+#include "qdesignerexportwidget.h"
 #include "abstractactioneditor.h"
 #include "abstractbrushmanager.h"
 #include "abstractdnditem.h"
@@ -29,9 +34,4 @@
 #include "membersheet.h"
 #include "propertysheet.h"
 #include "taskmenu.h"
-#include "abstractformbuilder.h"
-#include "container.h"
-#include "customwidget.h"
-#include "formbuilder.h"
-#include "qdesignerexportwidget.h"
 #endif
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtGui/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtGui/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/QtGui/headers.pri	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtGui/headers.pri	2010-02-23 14:51:01.863613554 +0100
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../gui/image/qbitmap.h ../gui/image/qicon.h ../gui/image/qiconengine.h ../gui/image/qiconengineplugin.h ../gui/image/qimage.h ../gui/image/qimageiohandler.h ../gui/image/qimagereader.h ../gui/image/qimagewriter.h ../gui/image/qmovie.h ../gui/image/qpicture.h ../gui/image/qpictureformatplugin.h ../gui/image/qpixmap.h ../gui/image/qpixmapcache.h ../gui/s60framework/qs60mainapplication.h ../gui/s60framework/qs60mainappui.h ../gui/s60framework/qs60maindocument.h ../gui/embedded/qcopchannel_qws.h ../gui/embedded/qdecoration_qws.h ../gui/embedded/qdecorationdefault_qws.h ../gui/embedded/qdecorationfactory_qws.h ../gui/embedded/qdecorationplugin_qws.h ../gui/embedded/qdecorationstyled_qws.h ../gui/embedded/qdecorationwindows_qws.h ../gui/embedded/qdirectpainter_qws.h ../gui/embedded/qkbd_qws.h ../gui/embedded/qkbddriverfactory_qws.h ../gui/embedded/qkbddriverplugin_qws.h ../gui/embedded/qkbdlinuxinput_qws.h ../gui/embedded/qkbdqnx_qws.h ../gui/embedded/qkbdtty_qws.h ../gui/embedded/qkbdum_qws.h ../gui/embedded/qkbdvfb_qws.h ../gui/embedded/qmouse_qws.h ../gui/embedded/qmousedriverfactory_qws.h ../gui/embedded/qmousedriverplugin_qws.h ../gui/embedded/qmouselinuxinput_qws.h ../gui/embedded/qmouselinuxtp_qws.h ../gui/embedded/qmousepc_qws.h ../gui/embedded/qmouseqnx_qws.h ../gui/embedded/qmousetslib_qws.h ../gui/embedded/qmousevfb_qws.h ../gui/embedded/qscreen_qws.h ../gui/embedded/qscreendriverfactory_qws.h ../gui/embedded/qscreendriverplugin_qws.h ../gui/embedded/qscreenlinuxfb_qws.h ../gui/embedded/qscreenproxy_qws.h ../gui/embedded/qscreenqnx_qws.h ../gui/embedded/qscreentransformed_qws.h ../gui/embedded/qscreenvfb_qws.h ../gui/embedded/qsoundqss_qws.h ../gui/embedded/qtransportauth_qws.h ../gui/embedded/qtransportauthdefs_qws.h ../gui/embedded/qvfbhdr.h ../gui/embedded/qwindowsystem_qws.h ../gui/embedded/qwscursor_qws.h ../gui/embedded/qwsdisplay_qws.h ../gui/embedded/qwsembedwidget.h ../gui/embedded/qwsevent_qws.h ../gui/embedded/qwsmanager_qws.h ../gui/embedded/qwsproperty_qws.h ../gui/embedded/qwsprotocolitem_qws.h ../gui/embedded/qwssocket_qws.h ../gui/embedded/qwsutils_qws.h ../gui/widgets/qabstractbutton.h ../gui/widgets/qabstractscrollarea.h ../gui/widgets/qabstractslider.h ../gui/widgets/qabstractspinbox.h ../gui/widgets/qbuttongroup.h ../gui/widgets/qcalendarwidget.h ../gui/widgets/qcheckbox.h ../gui/widgets/qcombobox.h ../gui/widgets/qcommandlinkbutton.h ../gui/widgets/qdatetimeedit.h ../gui/widgets/qdial.h ../gui/widgets/qdialogbuttonbox.h ../gui/widgets/qdockwidget.h ../gui/widgets/qfocusframe.h ../gui/widgets/qfontcombobox.h ../gui/widgets/qframe.h ../gui/widgets/qgroupbox.h ../gui/widgets/qlabel.h ../gui/widgets/qlcdnumber.h ../gui/widgets/qlineedit.h ../gui/widgets/qmaccocoaviewcontainer_mac.h ../gui/widgets/qmacnativewidget_mac.h ../gui/widgets/qmainwindow.h ../gui/widgets/qmdiarea.h ../gui/widgets/qmdisubwindow.h ../gui/widgets/qmenu.h ../gui/widgets/qmenubar.h ../gui/widgets/qmenudata.h ../gui/widgets/qplaintextedit.h ../gui/widgets/qprintpreviewwidget.h ../gui/widgets/qprogressbar.h ../gui/widgets/qpushbutton.h ../gui/widgets/qradiobutton.h ../gui/widgets/qrubberband.h ../gui/widgets/qscrollarea.h ../gui/widgets/qscrollbar.h ../gui/widgets/qsizegrip.h ../gui/widgets/qslider.h ../gui/widgets/qspinbox.h ../gui/widgets/qsplashscreen.h ../gui/widgets/qsplitter.h ../gui/widgets/qstackedwidget.h ../gui/widgets/qstatusbar.h ../gui/widgets/qtabbar.h ../gui/widgets/qtabwidget.h ../gui/widgets/qtextbrowser.h ../gui/widgets/qtextedit.h ../gui/widgets/qtoolbar.h ../gui/widgets/qtoolbox.h ../gui/widgets/qtoolbutton.h ../gui/widgets/qvalidator.h ../gui/widgets/qworkspace.h ../gui/inputmethod/qinputcontext.h ../gui/inputmethod/qinputcontextfactory.h ../gui/inputmethod/qinputcontextplugin.h ../gui/graphicsview/qgraphicsanchorlayout.h ../gui/graphicsview/qgraphicsgridlayout.h ../gui/graphicsview/qgraphicsitem.h ../gui/graphicsview/qgraphicsitemanimation.h ../gui/graphicsview/qgraphicslayout.h ../gui/graphicsview/qgraphicslayoutitem.h ../gui/graphicsview/qgraphicslinearlayout.h ../gui/graphicsview/qgraphicsproxywidget.h ../gui/graphicsview/qgraphicsscene.h ../gui/graphicsview/qgraphicssceneevent.h ../gui/graphicsview/qgraphicstransform.h ../gui/graphicsview/qgraphicsview.h ../gui/graphicsview/qgraphicswidget.h ../gui/math3d/qgenericmatrix.h ../gui/math3d/qmatrix4x4.h ../gui/math3d/qquaternion.h ../gui/math3d/qvector2d.h ../gui/math3d/qvector3d.h ../gui/math3d/qvector4d.h ../gui/text/qabstractfontengine_qws.h ../gui/text/qabstracttextdocumentlayout.h ../gui/text/qfont.h ../gui/text/qfontdatabase.h ../gui/text/qfontinfo.h ../gui/text/qfontmetrics.h ../gui/text/qsyntaxhighlighter.h ../gui/text/qtextcursor.h ../gui/text/qtextdocument.h ../gui/text/qtextdocumentfragment.h ../gui/text/qtextdocumentwriter.h ../gui/text/qtextformat.h ../gui/text/qtextlayout.h ../gui/text/qtextlist.h ../gui/text/qtextobject.h ../gui/text/qtextoption.h ../gui/text/qtexttable.h ../gui/dialogs/qabstractpagesetupdialog.h ../gui/dialogs/qabstractprintdialog.h ../gui/dialogs/qcolordialog.h ../gui/dialogs/qdialog.h ../gui/dialogs/qerrormessage.h ../gui/dialogs/qfiledialog.h ../gui/dialogs/qfilesystemmodel.h ../gui/dialogs/qfontdialog.h ../gui/dialogs/qinputdialog.h ../gui/dialogs/qmessagebox.h ../gui/dialogs/qpagesetupdialog.h ../gui/dialogs/qprintdialog.h ../gui/dialogs/qprintpreviewdialog.h ../gui/dialogs/qprogressdialog.h ../gui/dialogs/qwizard.h ../gui/accessible/qaccessible.h ../gui/accessible/qaccessible2.h ../gui/accessible/qaccessiblebridge.h ../gui/accessible/qaccessibleobject.h ../gui/accessible/qaccessibleplugin.h ../gui/accessible/qaccessiblewidget.h ../gui/kernel/qaction.h ../gui/kernel/qactiongroup.h ../gui/kernel/qapplication.h ../gui/kernel/qboxlayout.h ../gui/kernel/qclipboard.h ../gui/kernel/qcursor.h ../gui/kernel/qdesktopwidget.h ../gui/kernel/qdrag.h ../gui/kernel/qevent.h ../gui/kernel/qformlayout.h ../gui/kernel/qgesture.h ../gui/kernel/qgesturerecognizer.h ../gui/kernel/qgridlayout.h ../gui/kernel/qguifunctions_wince.h ../gui/kernel/qkeysequence.h ../gui/kernel/qlayout.h ../gui/kernel/qlayoutitem.h ../gui/kernel/qmacdefines_mac.h ../gui/kernel/qmime.h ../gui/kernel/qpalette.h ../gui/kernel/qsessionmanager.h ../gui/kernel/qshortcut.h ../gui/kernel/qsizepolicy.h ../gui/kernel/qsound.h ../gui/kernel/qstackedlayout.h ../gui/kernel/qtooltip.h ../gui/kernel/qwhatsthis.h ../gui/kernel/qwidget.h ../gui/kernel/qwidgetaction.h ../gui/kernel/qwindowdefs.h ../gui/kernel/qwindowdefs_win.h ../gui/kernel/qx11embed_x11.h ../gui/kernel/qx11info_x11.h ../gui/itemviews/qabstractitemdelegate.h ../gui/itemviews/qabstractitemview.h ../gui/itemviews/qabstractproxymodel.h ../gui/itemviews/qcolumnview.h ../gui/itemviews/qdatawidgetmapper.h ../gui/itemviews/qdirmodel.h ../gui/itemviews/qfileiconprovider.h ../gui/itemviews/qheaderview.h ../gui/itemviews/qitemdelegate.h ../gui/itemviews/qitemeditorfactory.h ../gui/itemviews/qitemselectionmodel.h ../gui/itemviews/qlistview.h ../gui/itemviews/qlistwidget.h ../gui/itemviews/qproxymodel.h ../gui/itemviews/qsortfilterproxymodel.h ../gui/itemviews/qstandarditemmodel.h ../gui/itemviews/qstringlistmodel.h ../gui/itemviews/qstyleditemdelegate.h ../gui/itemviews/qtableview.h ../gui/itemviews/qtablewidget.h ../gui/itemviews/qtreeview.h ../gui/itemviews/qtreewidget.h ../gui/itemviews/qtreewidgetitemiterator.h ../gui/painting/qbrush.h ../gui/painting/qcolor.h ../gui/painting/qcolormap.h ../gui/painting/qdrawutil.h ../gui/painting/qmatrix.h ../gui/painting/qpaintdevice.h ../gui/painting/qpaintengine.h ../gui/painting/qpainter.h ../gui/painting/qpainterpath.h ../gui/painting/qpen.h ../gui/painting/qpolygon.h ../gui/painting/qprintengine.h ../gui/painting/qprinter.h ../gui/painting/qprinterinfo.h ../gui/painting/qregion.h ../gui/painting/qrgb.h ../gui/painting/qstylepainter.h ../gui/painting/qtransform.h ../gui/painting/qwmatrix.h ../gui/symbian/qsymbianevent.h ../gui/styles/qcdestyle.h ../gui/styles/qcleanlooksstyle.h ../gui/styles/qcommonstyle.h ../gui/styles/qgtkstyle.h ../gui/styles/qmacstyle_mac.h ../gui/styles/qmotifstyle.h ../gui/styles/qplastiquestyle.h ../gui/styles/qproxystyle.h ../gui/styles/qs60style.h ../gui/styles/qstyle.h ../gui/styles/qstylefactory.h ../gui/styles/qstyleoption.h ../gui/styles/qstyleplugin.h ../gui/styles/qwindowscestyle.h ../gui/styles/qwindowsmobilestyle.h ../gui/styles/qwindowsstyle.h ../gui/styles/qwindowsvistastyle.h ../gui/styles/qwindowsxpstyle.h ../gui/statemachine/qkeyeventtransition.h ../gui/statemachine/qmouseeventtransition.h ../gui/effects/qgraphicseffect.h ../gui/util/qcompleter.h ../gui/util/qdesktopservices.h ../gui/util/qsystemtrayicon.h ../gui/util/qundogroup.h ../gui/util/qundostack.h ../gui/util/qundoview.h ../../include/QtGui/QtGui 
-SYNCQT.HEADER_CLASSES = ../../include/QtGui/QBitmap ../../include/QtGui/QIcon ../../include/QtGui/QIconSet ../../include/QtGui/QIconEngine ../../include/QtGui/QIconEngineV2 ../../include/QtGui/QIconEngineFactoryInterface ../../include/QtGui/QIconEnginePlugin ../../include/QtGui/QIconEngineFactoryInterfaceV2 ../../include/QtGui/QIconEnginePluginV2 ../../include/QtGui/QImageTextKeyLang ../../include/QtGui/QImage ../../include/QtGui/QImageIOHandler ../../include/QtGui/QImageIOHandlerFactoryInterface ../../include/QtGui/QImageIOPlugin ../../include/QtGui/QImageReader ../../include/QtGui/QImageWriter ../../include/QtGui/QMovie ../../include/QtGui/QPicture ../../include/QtGui/QPictureIO ../../include/QtGui/QPictureFormatInterface ../../include/QtGui/QPictureFormatPlugin ../../include/QtGui/QPixmap ../../include/QtGui/QPixmapCache ../../include/QtGui/QS60MainApplication ../../include/QtGui/QS60MainAppUi ../../include/QtGui/QS60MainDocument ../../include/QtGui/QCopChannel ../../include/QtGui/QDecorationAction ../../include/QtGui/QDecoration ../../include/QtGui/QDecorationDefault ../../include/QtGui/QDecorationFactory ../../include/QtGui/QDecorationFactoryInterface ../../include/QtGui/QDecorationPlugin ../../include/QtGui/QDecorationStyled ../../include/QtGui/QDecorationWindows ../../include/QtGui/QDirectPainter ../../include/QtGui/QWSKeyboardHandler ../../include/QtGui/QKbdDriverFactory ../../include/QtGui/QWSKeyboardHandlerFactoryInterface ../../include/QtGui/QKbdDriverPlugin ../../include/QtGui/QWSLinuxInputKeyboardHandler ../../include/QtGui/QWSQnxKeyboardHandler ../../include/QtGui/QWSTtyKeyboardHandler ../../include/QtGui/QWSUmKeyboardHandler ../../include/QtGui/QVFbKeyboardHandler ../../include/QtGui/QWSPointerCalibrationData ../../include/QtGui/QWSMouseHandler ../../include/QtGui/QWSCalibratedMouseHandler ../../include/QtGui/QMouseDriverFactory ../../include/QtGui/QWSMouseHandlerFactoryInterface ../../include/QtGui/QMouseDriverPlugin ../../include/QtGui/QWSLinuxInputMouseHandler ../../include/QtGui/QWSLinuxTPMouseHandler ../../include/QtGui/QWSPcMouseHandler ../../include/QtGui/QQnxMouseHandler ../../include/QtGui/QWSTslibMouseHandler ../../include/QtGui/QVFbMouseHandler ../../include/QtGui/QScreenCursor ../../include/QtGui/QPoolEntry ../../include/QtGui/QScreen ../../include/QtGui/QScreenDriverFactory ../../include/QtGui/QScreenDriverFactoryInterface ../../include/QtGui/QScreenDriverPlugin ../../include/QtGui/QLinuxFb_Shared ../../include/QtGui/QLinuxFbScreen ../../include/QtGui/QProxyScreenCursor ../../include/QtGui/QProxyScreen ../../include/QtGui/QQnxScreen ../../include/QtGui/QTransformedScreen ../../include/QtGui/QVFbScreen ../../include/QtGui/QWSSoundServer ../../include/QtGui/QWSSoundClient ../../include/QtGui/QWSSoundServerSocket ../../include/QtGui/QTransportAuth ../../include/QtGui/QAuthDevice ../../include/QtGui/QVFbHeader ../../include/QtGui/QVFbKeyData ../../include/QtGui/QWSInternalWindowInfo ../../include/QtGui/QWSScreenSaver ../../include/QtGui/QWSWindow ../../include/QtGui/QWSServer ../../include/QtGui/QWSInputMethod ../../include/QtGui/QWSCursorMap ../../include/QtGui/QWSClient ../../include/QtGui/QWSCursor ../../include/QtGui/QWSWindowInfo ../../include/QtGui/QWSDisplay ../../include/QtGui/QWSEmbedWidget ../../include/QtGui/QWSEvent ../../include/QtGui/QWSManager ../../include/QtGui/QWSPropertyManager ../../include/QtGui/QWSProtocolItem ../../include/QtGui/QWSSocket ../../include/QtGui/QWSServerSocket ../../include/QtGui/QAbstractButton ../../include/QtGui/QAbstractScrollArea ../../include/QtGui/QAbstractSlider ../../include/QtGui/QAbstractSpinBox ../../include/QtGui/QButtonGroup ../../include/QtGui/QCalendarWidget ../../include/QtGui/QCheckBox ../../include/QtGui/QComboBox ../../include/QtGui/QCommandLinkButton ../../include/QtGui/QDateTimeEdit ../../include/QtGui/QTimeEdit ../../include/QtGui/QDateEdit ../../include/QtGui/QDial ../../include/QtGui/QDialogButtonBox ../../include/QtGui/QDockWidget ../../include/QtGui/QFocusFrame ../../include/QtGui/QFontComboBox ../../include/QtGui/QFrame ../../include/QtGui/QGroupBox ../../include/QtGui/QLabel ../../include/QtGui/QLCDNumber ../../include/QtGui/QLineEdit ../../include/QtGui/QMacCocoaViewContainer ../../include/QtGui/QMacNativeWidget ../../include/QtGui/QMainWindow ../../include/QtGui/QMdiArea ../../include/QtGui/QMdiSubWindow ../../include/QtGui/QMenu ../../include/QtGui/QMenuBar ../../include/QtGui/QMenuItem ../../include/QtGui/QPlainTextEdit ../../include/QtGui/QPlainTextDocumentLayout ../../include/QtGui/QPrintPreviewWidget ../../include/QtGui/QProgressBar ../../include/QtGui/QPushButton ../../include/QtGui/QRadioButton ../../include/QtGui/QRubberBand ../../include/QtGui/QScrollArea ../../include/QtGui/QScrollBar ../../include/QtGui/QSizeGrip ../../include/QtGui/QSlider ../../include/QtGui/QSpinBox ../../include/QtGui/QDoubleSpinBox ../../include/QtGui/QSplashScreen ../../include/QtGui/QSplitter ../../include/QtGui/QSplitterHandle ../../include/QtGui/QStackedWidget ../../include/QtGui/QStatusBar ../../include/QtGui/QTabBar ../../include/QtGui/QTabWidget ../../include/QtGui/QTextBrowser ../../include/QtGui/QTextEdit ../../include/QtGui/QToolBar ../../include/QtGui/QToolBox ../../include/QtGui/QToolButton ../../include/QtGui/QValidator ../../include/QtGui/QIntValidator ../../include/QtGui/QDoubleValidator ../../include/QtGui/QRegExpValidator ../../include/QtGui/QWorkspace ../../include/QtGui/QInputContext ../../include/QtGui/QInputContextFactory ../../include/QtGui/QInputContextFactoryInterface ../../include/QtGui/QInputContextPlugin ../../include/QtGui/QGraphicsAnchor ../../include/QtGui/QGraphicsAnchorLayout ../../include/QtGui/QGraphicsGridLayout ../../include/QtGui/QGraphicsItem ../../include/QtGui/QGraphicsObject ../../include/QtGui/QAbstractGraphicsShapeItem ../../include/QtGui/QGraphicsPathItem ../../include/QtGui/QGraphicsRectItem ../../include/QtGui/QGraphicsEllipseItem ../../include/QtGui/QGraphicsPolygonItem ../../include/QtGui/QGraphicsLineItem ../../include/QtGui/QGraphicsPixmapItem ../../include/QtGui/QGraphicsTextItem ../../include/QtGui/QGraphicsSimpleTextItem ../../include/QtGui/QGraphicsItemGroup ../../include/QtGui/QGraphicsItemAnimation ../../include/QtGui/QGraphicsLayout ../../include/QtGui/QGraphicsLayoutItem ../../include/QtGui/QGraphicsLinearLayout ../../include/QtGui/QGraphicsProxyWidget ../../include/QtGui/QGraphicsScene ../../include/QtGui/QGraphicsSceneEvent ../../include/QtGui/QGraphicsSceneMouseEvent ../../include/QtGui/QGraphicsSceneWheelEvent ../../include/QtGui/QGraphicsSceneContextMenuEvent ../../include/QtGui/QGraphicsSceneHoverEvent ../../include/QtGui/QGraphicsSceneHelpEvent ../../include/QtGui/QGraphicsSceneDragDropEvent ../../include/QtGui/QGraphicsSceneResizeEvent ../../include/QtGui/QGraphicsSceneMoveEvent ../../include/QtGui/QGraphicsTransform ../../include/QtGui/QGraphicsScale ../../include/QtGui/QGraphicsRotation ../../include/QtGui/QGraphicsView ../../include/QtGui/QGraphicsWidget ../../include/QtGui/QGenericMatrix ../../include/QtGui/QMatrix2x2 ../../include/QtGui/QMatrix2x3 ../../include/QtGui/QMatrix2x4 ../../include/QtGui/QMatrix3x2 ../../include/QtGui/QMatrix3x3 ../../include/QtGui/QMatrix3x4 ../../include/QtGui/QMatrix4x2 ../../include/QtGui/QMatrix4x3 ../../include/QtGui/QMatrix4x4 ../../include/QtGui/QQuaternion ../../include/QtGui/QVector2D ../../include/QtGui/QVector3D ../../include/QtGui/QVector4D ../../include/QtGui/QFontEngineInfo ../../include/QtGui/QFontEngineFactoryInterface ../../include/QtGui/QFontEnginePlugin ../../include/QtGui/QAbstractFontEngine ../../include/QtGui/QAbstractTextDocumentLayout ../../include/QtGui/QTextObjectInterface ../../include/QtGui/QFont ../../include/QtGui/QFontDatabase ../../include/QtGui/QFontInfo ../../include/QtGui/QFontMetrics ../../include/QtGui/QFontMetricsF ../../include/QtGui/QSyntaxHighlighter ../../include/QtGui/QTextCursor ../../include/QtGui/QAbstractUndoItem ../../include/QtGui/QTextDocument ../../include/QtGui/QTextDocumentFragment ../../include/QtGui/QTextDocumentWriter ../../include/QtGui/QTextLength ../../include/QtGui/QTextFormat ../../include/QtGui/QTextCharFormat ../../include/QtGui/QTextBlockFormat ../../include/QtGui/QTextListFormat ../../include/QtGui/QTextImageFormat ../../include/QtGui/QTextFrameFormat ../../include/QtGui/QTextTableFormat ../../include/QtGui/QTextTableCellFormat ../../include/QtGui/QTextInlineObject ../../include/QtGui/QTextLayout ../../include/QtGui/QTextLine ../../include/QtGui/QTextList ../../include/QtGui/QTextObject ../../include/QtGui/QTextBlockGroup ../../include/QtGui/QTextFrameLayoutData ../../include/QtGui/QTextFrame ../../include/QtGui/QTextBlockUserData ../../include/QtGui/QTextBlock ../../include/QtGui/QTextFragment ../../include/QtGui/QTextOption ../../include/QtGui/QTextTableCell ../../include/QtGui/QTextTable ../../include/QtGui/QAbstractPageSetupDialog ../../include/QtGui/QAbstractPrintDialog ../../include/QtGui/QColorDialog ../../include/QtGui/QDialog ../../include/QtGui/QErrorMessage ../../include/QtGui/QFileDialog ../../include/QtGui/QFileSystemModel ../../include/QtGui/QFontDialog ../../include/QtGui/QInputDialog ../../include/QtGui/QMessageBox ../../include/QtGui/QPageSetupDialog ../../include/QtGui/QUnixPrintWidget ../../include/QtGui/QPrintDialog ../../include/QtGui/QPrintPreviewDialog ../../include/QtGui/QProgressDialog ../../include/QtGui/QWizard ../../include/QtGui/QWizardPage ../../include/QtGui/QAccessible ../../include/QtGui/QAccessibleInterface ../../include/QtGui/QAccessibleInterfaceEx ../../include/QtGui/QAccessibleEvent ../../include/QtGui/QAccessible2Interface ../../include/QtGui/QAccessibleTextInterface ../../include/QtGui/QAccessibleEditableTextInterface ../../include/QtGui/QAccessibleSimpleEditableTextInterface ../../include/QtGui/QAccessibleValueInterface ../../include/QtGui/QAccessibleTableInterface ../../include/QtGui/QAccessibleActionInterface ../../include/QtGui/QAccessibleImageInterface ../../include/QtGui/QAccessibleBridge ../../include/QtGui/QAccessibleBridgeFactoryInterface ../../include/QtGui/QAccessibleBridgePlugin ../../include/QtGui/QAccessibleObject ../../include/QtGui/QAccessibleObjectEx ../../include/QtGui/QAccessibleApplication ../../include/QtGui/QAccessibleFactoryInterface ../../include/QtGui/QAccessiblePlugin ../../include/QtGui/QAccessibleWidget ../../include/QtGui/QAccessibleWidgetEx ../../include/QtGui/QAction ../../include/QtGui/QActionGroup ../../include/QtGui/QApplication ../../include/QtGui/QBoxLayout ../../include/QtGui/QHBoxLayout ../../include/QtGui/QVBoxLayout ../../include/QtGui/QClipboard ../../include/QtGui/QCursor ../../include/QtGui/QCursorShape ../../include/QtGui/QDesktopWidget ../../include/QtGui/QDrag ../../include/QtGui/QtEvents ../../include/QtGui/QInputEvent ../../include/QtGui/QMouseEvent ../../include/QtGui/QHoverEvent ../../include/QtGui/QWheelEvent ../../include/QtGui/QTabletEvent ../../include/QtGui/QKeyEvent ../../include/QtGui/QFocusEvent ../../include/QtGui/QPaintEvent ../../include/QtGui/QUpdateLaterEvent ../../include/QtGui/QMoveEvent ../../include/QtGui/QResizeEvent ../../include/QtGui/QCloseEvent ../../include/QtGui/QIconDragEvent ../../include/QtGui/QShowEvent ../../include/QtGui/QHideEvent ../../include/QtGui/QContextMenuEvent ../../include/QtGui/QInputMethodEvent ../../include/QtGui/QDropEvent ../../include/QtGui/QDragMoveEvent ../../include/QtGui/QDragEnterEvent ../../include/QtGui/QDragResponseEvent ../../include/QtGui/QDragLeaveEvent ../../include/QtGui/QHelpEvent ../../include/QtGui/QStatusTipEvent ../../include/QtGui/QWhatsThisClickedEvent ../../include/QtGui/QActionEvent ../../include/QtGui/QFileOpenEvent ../../include/QtGui/QToolBarChangeEvent ../../include/QtGui/QShortcutEvent ../../include/QtGui/QClipboardEvent ../../include/QtGui/QWindowStateChangeEvent ../../include/QtGui/QMenubarUpdatedEvent ../../include/QtGui/QTouchEvent ../../include/QtGui/QGestureEvent ../../include/QtGui/QFormLayout ../../include/QtGui/QGesture ../../include/QtGui/QPanGesture ../../include/QtGui/QPinchGesture ../../include/QtGui/QSwipeGesture ../../include/QtGui/QTapGesture ../../include/QtGui/QTapAndHoldGesture ../../include/QtGui/QGestureRecognizer ../../include/QtGui/QGridLayout ../../include/QtGui/QKeySequence ../../include/QtGui/QLayoutIterator ../../include/QtGui/QLayout ../../include/QtGui/QLayoutItem ../../include/QtGui/QSpacerItem ../../include/QtGui/QWidgetItem ../../include/QtGui/QWidgetItemV2 ../../include/QtGui/QMimeSource ../../include/QtGui/QWindowsMime ../../include/QtGui/QMacMime ../../include/QtGui/QMacPasteboardMime ../../include/QtGui/QPalette ../../include/QtGui/QColorGroup ../../include/QtGui/QSessionManager ../../include/QtGui/QShortcut ../../include/QtGui/QSizePolicy ../../include/QtGui/QSound ../../include/QtGui/QStackedLayout ../../include/QtGui/QToolTip ../../include/QtGui/QWhatsThis ../../include/QtGui/QWidgetData ../../include/QtGui/QWidget ../../include/QtGui/QWidgetAction ../../include/QtGui/QWidgetList ../../include/QtGui/QWidgetMapper ../../include/QtGui/QWidgetSet ../../include/QtGui/QX11EmbedWidget ../../include/QtGui/QX11EmbedContainer ../../include/QtGui/QX11Info ../../include/QtGui/QAbstractItemDelegate ../../include/QtGui/QAbstractItemView ../../include/QtGui/QAbstractProxyModel ../../include/QtGui/QColumnView ../../include/QtGui/QDataWidgetMapper ../../include/QtGui/QDirModel ../../include/QtGui/QFileIconProvider ../../include/QtGui/QHeaderView ../../include/QtGui/QItemDelegate ../../include/QtGui/QItemEditorCreatorBase ../../include/QtGui/QItemEditorCreator ../../include/QtGui/QStandardItemEditorCreator ../../include/QtGui/QItemEditorFactory ../../include/QtGui/QItemSelectionRange ../../include/QtGui/QItemSelectionModel ../../include/QtGui/QItemSelection ../../include/QtGui/QListView ../../include/QtGui/QListWidgetItem ../../include/QtGui/QListWidget ../../include/QtGui/QProxyModel ../../include/QtGui/QSortFilterProxyModel ../../include/QtGui/QStandardItem ../../include/QtGui/QStandardItemModel ../../include/QtGui/QStringListModel ../../include/QtGui/QStyledItemDelegate ../../include/QtGui/QTableView ../../include/QtGui/QTableWidgetSelectionRange ../../include/QtGui/QTableWidgetItem ../../include/QtGui/QTableWidget ../../include/QtGui/QTreeView ../../include/QtGui/QTreeWidgetItem ../../include/QtGui/QTreeWidget ../../include/QtGui/QTreeWidgetItemIterator ../../include/QtGui/QBrush ../../include/QtGui/QBrushData ../../include/QtGui/QGradientStop ../../include/QtGui/QGradientStops ../../include/QtGui/QGradient ../../include/QtGui/QLinearGradient ../../include/QtGui/QRadialGradient ../../include/QtGui/QConicalGradient ../../include/QtGui/QColor ../../include/QtGui/QColormap ../../include/QtGui/QTileRules ../../include/QtGui/QMatrix ../../include/QtGui/QPaintDevice ../../include/QtGui/QTextItem ../../include/QtGui/QPaintEngine ../../include/QtGui/QPaintEngineState ../../include/QtGui/QPainter ../../include/QtGui/QPainterPath ../../include/QtGui/QPainterPathPrivate ../../include/QtGui/QPainterPathStroker ../../include/QtGui/QPen ../../include/QtGui/QPolygon ../../include/QtGui/QPolygonF ../../include/QtGui/QPrintEngine ../../include/QtGui/QPrinter ../../include/QtGui/QPrinterInfo ../../include/QtGui/QRegion ../../include/QtGui/QRgb ../../include/QtGui/QStylePainter ../../include/QtGui/QTransform ../../include/QtGui/QWMatrix ../../include/QtGui/QSymbianEvent ../../include/QtGui/QCDEStyle ../../include/QtGui/QCleanlooksStyle ../../include/QtGui/QCommonStyle ../../include/QtGui/QGtkStyle ../../include/QtGui/QMacStyle ../../include/QtGui/QMotifStyle ../../include/QtGui/QPlastiqueStyle ../../include/QtGui/QProxyStyle ../../include/QtGui/QS60Style ../../include/QtGui/QStyle ../../include/QtGui/QStyleFactory ../../include/QtGui/QStyleOption ../../include/QtGui/QStyleOptionFocusRect ../../include/QtGui/QStyleOptionFrame ../../include/QtGui/QStyleOptionFrameV2 ../../include/QtGui/QStyleOptionFrameV3 ../../include/QtGui/QStyleOptionTabWidgetFrame ../../include/QtGui/QStyleOptionTabWidgetFrameV2 ../../include/QtGui/QStyleOptionTabBarBase ../../include/QtGui/QStyleOptionTabBarBaseV2 ../../include/QtGui/QStyleOptionHeader ../../include/QtGui/QStyleOptionButton ../../include/QtGui/QStyleOptionTab ../../include/QtGui/QStyleOptionTabV2 ../../include/QtGui/QStyleOptionTabV3 ../../include/QtGui/QStyleOptionToolBar ../../include/QtGui/QStyleOptionProgressBar ../../include/QtGui/QStyleOptionProgressBarV2 ../../include/QtGui/QStyleOptionMenuItem ../../include/QtGui/QStyleOptionQ3ListViewItem ../../include/QtGui/QStyleOptionQ3DockWindow ../../include/QtGui/QStyleOptionDockWidget ../../include/QtGui/QStyleOptionDockWidgetV2 ../../include/QtGui/QStyleOptionViewItem ../../include/QtGui/QStyleOptionViewItemV2 ../../include/QtGui/QStyleOptionViewItemV3 ../../include/QtGui/QStyleOptionViewItemV4 ../../include/QtGui/QStyleOptionToolBox ../../include/QtGui/QStyleOptionToolBoxV2 ../../include/QtGui/QStyleOptionRubberBand ../../include/QtGui/QStyleOptionComplex ../../include/QtGui/QStyleOptionSlider ../../include/QtGui/QStyleOptionSpinBox ../../include/QtGui/QStyleOptionQ3ListView ../../include/QtGui/QStyleOptionToolButton ../../include/QtGui/QStyleOptionComboBox ../../include/QtGui/QStyleOptionTitleBar ../../include/QtGui/QStyleOptionGroupBox ../../include/QtGui/QStyleOptionSizeGrip ../../include/QtGui/QStyleOptionGraphicsItem ../../include/QtGui/QStyleHintReturn ../../include/QtGui/QStyleHintReturnMask ../../include/QtGui/QStyleHintReturnVariant ../../include/QtGui/QStyleFactoryInterface ../../include/QtGui/QStylePlugin ../../include/QtGui/QWindowsCEStyle ../../include/QtGui/QWindowsMobileStyle ../../include/QtGui/QWindowsStyle ../../include/QtGui/QWindowsVistaStyle ../../include/QtGui/QWindowsXPStyle ../../include/QtGui/QKeyEventTransition ../../include/QtGui/QMouseEventTransition ../../include/QtGui/QGraphicsEffect ../../include/QtGui/QGraphicsColorizeEffect ../../include/QtGui/QGraphicsBlurEffect ../../include/QtGui/QGraphicsDropShadowEffect ../../include/QtGui/QGraphicsOpacityEffect ../../include/QtGui/QCompleter ../../include/QtGui/QDesktopServices ../../include/QtGui/QSystemTrayIcon ../../include/QtGui/QUndoGroup ../../include/QtGui/QUndoCommand ../../include/QtGui/QUndoStack ../../include/QtGui/QUndoView 
-SYNCQT.PRIVATE_HEADER_FILES = ../gui/image/qbmphandler_p.h ../gui/image/qicon_p.h ../gui/image/qiconloader_p.h ../gui/image/qimage_p.h ../gui/image/qimagepixmapcleanuphooks_p.h ../gui/image/qnativeimage_p.h ../gui/image/qpaintengine_pic_p.h ../gui/image/qpicture_p.h ../gui/image/qpixmap_mac_p.h ../gui/image/qpixmap_raster_p.h ../gui/image/qpixmap_s60_p.h ../gui/image/qpixmap_x11_p.h ../gui/image/qpixmapcache_p.h ../gui/image/qpixmapdata_p.h ../gui/image/qpixmapdatafactory_p.h ../gui/image/qpixmapfilter_p.h ../gui/image/qpnghandler_p.h ../gui/image/qppmhandler_p.h ../gui/image/qxbmhandler_p.h ../gui/image/qxpmhandler_p.h ../gui/s60framework/qs60mainapplication_p.h ../gui/embedded/qkbd_defaultmap_qws_p.h ../gui/embedded/qkbd_qws_p.h ../gui/embedded/qlock_p.h ../gui/embedded/qscreenmulti_qws_p.h ../gui/embedded/qtransportauth_qws_p.h ../gui/embedded/qunixsocket_p.h ../gui/embedded/qunixsocketserver_p.h ../gui/embedded/qwindowsystem_p.h ../gui/embedded/qwscommand_qws_p.h ../gui/embedded/qwsdisplay_qws_p.h ../gui/embedded/qwslock_p.h ../gui/embedded/qwsmanager_p.h ../gui/embedded/qwssharedmemory_p.h ../gui/embedded/qwssignalhandler_p.h ../gui/widgets/qabstractbutton_p.h ../gui/widgets/qabstractscrollarea_p.h ../gui/widgets/qabstractslider_p.h ../gui/widgets/qabstractspinbox_p.h ../gui/widgets/qcalendartextnavigator_p.h ../gui/widgets/qcocoamenu_mac_p.h ../gui/widgets/qcocoatoolbardelegate_mac_p.h ../gui/widgets/qcombobox_p.h ../gui/widgets/qdatetimeedit_p.h ../gui/widgets/qdockarealayout_p.h ../gui/widgets/qdockwidget_p.h ../gui/widgets/qeffects_p.h ../gui/widgets/qframe_p.h ../gui/widgets/qlabel_p.h ../gui/widgets/qlinecontrol_p.h ../gui/widgets/qlineedit_p.h ../gui/widgets/qmainwindowlayout_p.h ../gui/widgets/qmdiarea_p.h ../gui/widgets/qmdisubwindow_p.h ../gui/widgets/qmenu_p.h ../gui/widgets/qmenu_wince_resource_p.h ../gui/widgets/qmenubar_p.h ../gui/widgets/qplaintextedit_p.h ../gui/widgets/qpushbutton_p.h ../gui/widgets/qscrollarea_p.h ../gui/widgets/qsplitter_p.h ../gui/widgets/qtabbar_p.h ../gui/widgets/qtextedit_p.h ../gui/widgets/qtoolbar_p.h ../gui/widgets/qtoolbararealayout_p.h ../gui/widgets/qtoolbarextension_p.h ../gui/widgets/qtoolbarlayout_p.h ../gui/widgets/qtoolbarseparator_p.h ../gui/widgets/qwidgetanimator_p.h ../gui/widgets/qwidgetresizehandler_p.h ../gui/inputmethod/qcoefepinputcontext_p.h ../gui/inputmethod/qinputcontext_p.h ../gui/inputmethod/qmacinputcontext_p.h ../gui/inputmethod/qwininputcontext_p.h ../gui/inputmethod/qwsinputcontext_p.h ../gui/inputmethod/qximinputcontext_p.h ../gui/graphicsview/qgraph_p.h ../gui/graphicsview/qgraphicsanchorlayout_p.h ../gui/graphicsview/qgraphicsitem_p.h ../gui/graphicsview/qgraphicslayout_p.h ../gui/graphicsview/qgraphicslayoutitem_p.h ../gui/graphicsview/qgraphicsproxywidget_p.h ../gui/graphicsview/qgraphicsscene_bsp_p.h ../gui/graphicsview/qgraphicsscene_p.h ../gui/graphicsview/qgraphicsscenebsptreeindex_p.h ../gui/graphicsview/qgraphicssceneindex_p.h ../gui/graphicsview/qgraphicsscenelinearindex_p.h ../gui/graphicsview/qgraphicstransform_p.h ../gui/graphicsview/qgraphicsview_p.h ../gui/graphicsview/qgraphicswidget_p.h ../gui/graphicsview/qgridlayoutengine_p.h ../gui/graphicsview/qsimplex_p.h ../gui/text/qabstractfontengine_p.h ../gui/text/qabstracttextdocumentlayout_p.h ../gui/text/qcssparser_p.h ../gui/text/qfont_p.h ../gui/text/qfontengine_ft_p.h ../gui/text/qfontengine_p.h ../gui/text/qfontengine_qpf_p.h ../gui/text/qfontengine_s60_p.h ../gui/text/qfontengine_win_p.h ../gui/text/qfontengine_x11_p.h ../gui/text/qfontengineglyphcache_p.h ../gui/text/qfontsubset_p.h ../gui/text/qfragmentmap_p.h ../gui/text/qtextcontrol_p.h ../gui/text/qtextcontrol_p_p.h ../gui/text/qtextcursor_p.h ../gui/text/qtextdocument_p.h ../gui/text/qtextdocumentfragment_p.h ../gui/text/qtextdocumentlayout_p.h ../gui/text/qtextengine_p.h ../gui/text/qtextformat_p.h ../gui/text/qtexthtmlparser_p.h ../gui/text/qtextimagehandler_p.h ../gui/text/qtextobject_p.h ../gui/text/qtextodfwriter_p.h ../gui/text/qtexttable_p.h ../gui/text/qzipreader_p.h ../gui/text/qzipwriter_p.h ../gui/dialogs/qabstractpagesetupdialog_p.h ../gui/dialogs/qabstractprintdialog_p.h ../gui/dialogs/qcolordialog_p.h ../gui/dialogs/qdialog_p.h ../gui/dialogs/qfiledialog_p.h ../gui/dialogs/qfileinfogatherer_p.h ../gui/dialogs/qfilesystemmodel_p.h ../gui/dialogs/qfontdialog_p.h ../gui/dialogs/qfscompleter_p.h ../gui/dialogs/qpagesetupdialog_unix_p.h ../gui/dialogs/qsidebar_p.h ../gui/dialogs/qwizard_win_p.h ../gui/accessible/qaccessible_mac_p.h ../gui/kernel/qaction_p.h ../gui/kernel/qapplication_p.h ../gui/kernel/qclipboard_p.h ../gui/kernel/qcocoaapplication_mac_p.h ../gui/kernel/qcocoaapplicationdelegate_mac_p.h ../gui/kernel/qcocoamenuloader_mac_p.h ../gui/kernel/qcocoapanel_mac_p.h ../gui/kernel/qcocoasharedwindowmethods_mac_p.h ../gui/kernel/qcocoaview_mac_p.h ../gui/kernel/qcocoawindow_mac_p.h ../gui/kernel/qcocoawindowcustomthemeframe_mac_p.h ../gui/kernel/qcocoawindowdelegate_mac_p.h ../gui/kernel/qcursor_p.h ../gui/kernel/qdesktopwidget_mac_p.h ../gui/kernel/qdnd_p.h ../gui/kernel/qevent_p.h ../gui/kernel/qeventdispatcher_glib_qws_p.h ../gui/kernel/qeventdispatcher_mac_p.h ../gui/kernel/qeventdispatcher_qws_p.h ../gui/kernel/qeventdispatcher_s60_p.h ../gui/kernel/qeventdispatcher_x11_p.h ../gui/kernel/qgesture_p.h ../gui/kernel/qgesturemanager_p.h ../gui/kernel/qguieventdispatcher_glib_p.h ../gui/kernel/qguiplatformplugin_p.h ../gui/kernel/qkde_p.h ../gui/kernel/qkeymapper_p.h ../gui/kernel/qkeysequence_p.h ../gui/kernel/qlayout_p.h ../gui/kernel/qlayoutengine_p.h ../gui/kernel/qmacgesturerecognizer_mac_p.h ../gui/kernel/qmultitouch_mac_p.h ../gui/kernel/qnsframeview_mac_p.h ../gui/kernel/qnsthemeframe_mac_p.h ../gui/kernel/qnstitledframe_mac_p.h ../gui/kernel/qshortcutmap_p.h ../gui/kernel/qsoftkeymanager_common_p.h ../gui/kernel/qsoftkeymanager_p.h ../gui/kernel/qsoftkeymanager_s60_p.h ../gui/kernel/qsound_p.h ../gui/kernel/qstandardgestures_p.h ../gui/kernel/qt_cocoa_helpers_mac_p.h ../gui/kernel/qt_gui_pch.h ../gui/kernel/qt_mac_p.h ../gui/kernel/qt_s60_p.h ../gui/kernel/qt_x11_p.h ../gui/kernel/qwidget_p.h ../gui/kernel/qwidgetaction_p.h ../gui/kernel/qwinnativepangesturerecognizer_win_p.h ../gui/itemviews/qabstractitemview_p.h ../gui/itemviews/qabstractproxymodel_p.h ../gui/itemviews/qbsptree_p.h ../gui/itemviews/qcolumnview_p.h ../gui/itemviews/qcolumnviewgrip_p.h ../gui/itemviews/qheaderview_p.h ../gui/itemviews/qitemeditorfactory_p.h ../gui/itemviews/qitemselectionmodel_p.h ../gui/itemviews/qlistview_p.h ../gui/itemviews/qlistwidget_p.h ../gui/itemviews/qproxymodel_p.h ../gui/itemviews/qstandarditemmodel_p.h ../gui/itemviews/qtableview_p.h ../gui/itemviews/qtablewidget_p.h ../gui/itemviews/qtreeview_p.h ../gui/itemviews/qtreewidget_p.h ../gui/itemviews/qtreewidgetitemiterator_p.h ../gui/itemviews/qwidgetitemdata_p.h ../gui/painting/qbackingstore_p.h ../gui/painting/qbezier_p.h ../gui/painting/qcolor_p.h ../gui/painting/qcssutil_p.h ../gui/painting/qcups_p.h ../gui/painting/qdatabuffer_p.h ../gui/painting/qdrawhelper_armv6_p.h ../gui/painting/qdrawhelper_mmx_p.h ../gui/painting/qdrawhelper_neon_p.h ../gui/painting/qdrawhelper_p.h ../gui/painting/qdrawhelper_sse_p.h ../gui/painting/qdrawhelper_x86_p.h ../gui/painting/qemulationpaintengine_p.h ../gui/painting/qfixed_p.h ../gui/painting/qgraphicssystem_mac_p.h ../gui/painting/qgraphicssystem_p.h ../gui/painting/qgraphicssystem_qws_p.h ../gui/painting/qgraphicssystem_raster_p.h ../gui/painting/qgraphicssystemfactory_p.h ../gui/painting/qgraphicssystemplugin_p.h ../gui/painting/qgrayraster_p.h ../gui/painting/qimagescale_p.h ../gui/painting/qmath_p.h ../gui/painting/qmemrotate_p.h ../gui/painting/qoutlinemapper_p.h ../gui/painting/qpaintbuffer_p.h ../gui/painting/qpaintengine_alpha_p.h ../gui/painting/qpaintengine_mac_p.h ../gui/painting/qpaintengine_p.h ../gui/painting/qpaintengine_preview_p.h ../gui/painting/qpaintengine_raster_p.h ../gui/painting/qpaintengine_s60_p.h ../gui/painting/qpaintengine_x11_p.h ../gui/painting/qpaintengineex_p.h ../gui/painting/qpainter_p.h ../gui/painting/qpainterpath_p.h ../gui/painting/qpathclipper_p.h ../gui/painting/qpdf_p.h ../gui/painting/qpen_p.h ../gui/painting/qpolygonclipper_p.h ../gui/painting/qprintengine_mac_p.h ../gui/painting/qprintengine_pdf_p.h ../gui/painting/qprintengine_ps_p.h ../gui/painting/qprintengine_qws_p.h ../gui/painting/qprintengine_win_p.h ../gui/painting/qprinter_p.h ../gui/painting/qprinterinfo_unix_p.h ../gui/painting/qrasterdefs_p.h ../gui/painting/qrasterizer_p.h ../gui/painting/qstroker_p.h ../gui/painting/qtessellator_p.h ../gui/painting/qtextureglyphcache_p.h ../gui/painting/qvectorpath_p.h ../gui/painting/qwindowsurface_mac_p.h ../gui/painting/qwindowsurface_p.h ../gui/painting/qwindowsurface_qws_p.h ../gui/painting/qwindowsurface_raster_p.h ../gui/painting/qwindowsurface_s60_p.h ../gui/painting/qwindowsurface_x11_p.h ../gui/styles/qcleanlooksstyle_p.h ../gui/styles/qcommonstyle_p.h ../gui/styles/qcommonstylepixmaps_p.h ../gui/styles/qgtkpainter_p.h ../gui/styles/qgtkstyle_p.h ../gui/styles/qmacstylepixmaps_mac_p.h ../gui/styles/qmotifstyle_p.h ../gui/styles/qproxystyle_p.h ../gui/styles/qs60style_p.h ../gui/styles/qstyle_p.h ../gui/styles/qstylehelper_p.h ../gui/styles/qstylesheetstyle_p.h ../gui/styles/qwindowscestyle_p.h ../gui/styles/qwindowsmobilestyle_p.h ../gui/styles/qwindowsstyle_p.h ../gui/styles/qwindowsvistastyle_p.h ../gui/styles/qwindowsxpstyle_p.h ../gui/egl/qegl_p.h ../gui/egl/qeglproperties_p.h ../gui/statemachine/qbasickeyeventtransition_p.h ../gui/statemachine/qbasicmouseeventtransition_p.h ../gui/effects/qgraphicseffect_p.h ../gui/util/qcompleter_p.h ../gui/util/qsystemtrayicon_p.h ../gui/util/qundostack_p.h 
+SYNCQT.HEADER_FILES = ../gui/graphicsview/qgraphicsanchorlayout.h ../gui/graphicsview/qgraphicsgridlayout.h ../gui/graphicsview/qgraphicsitem.h ../gui/graphicsview/qgraphicsitemanimation.h ../gui/graphicsview/qgraphicslayout.h ../gui/graphicsview/qgraphicslayoutitem.h ../gui/graphicsview/qgraphicslinearlayout.h ../gui/graphicsview/qgraphicsproxywidget.h ../gui/graphicsview/qgraphicsscene.h ../gui/graphicsview/qgraphicssceneevent.h ../gui/graphicsview/qgraphicstransform.h ../gui/graphicsview/qgraphicsview.h ../gui/graphicsview/qgraphicswidget.h ../gui/statemachine/qkeyeventtransition.h ../gui/statemachine/qmouseeventtransition.h ../gui/text/qabstractfontengine_qws.h ../gui/text/qabstracttextdocumentlayout.h ../gui/text/qfont.h ../gui/text/qfontdatabase.h ../gui/text/qfontinfo.h ../gui/text/qfontmetrics.h ../gui/text/qsyntaxhighlighter.h ../gui/text/qtextcursor.h ../gui/text/qtextdocument.h ../gui/text/qtextdocumentfragment.h ../gui/text/qtextdocumentwriter.h ../gui/text/qtextformat.h ../gui/text/qtextlayout.h ../gui/text/qtextlist.h ../gui/text/qtextobject.h ../gui/text/qtextoption.h ../gui/text/qtexttable.h ../gui/widgets/qabstractbutton.h ../gui/widgets/qabstractscrollarea.h ../gui/widgets/qabstractslider.h ../gui/widgets/qabstractspinbox.h ../gui/widgets/qbuttongroup.h ../gui/widgets/qcalendarwidget.h ../gui/widgets/qcheckbox.h ../gui/widgets/qcombobox.h ../gui/widgets/qcommandlinkbutton.h ../gui/widgets/qdatetimeedit.h ../gui/widgets/qdial.h ../gui/widgets/qdialogbuttonbox.h ../gui/widgets/qdockwidget.h ../gui/widgets/qfocusframe.h ../gui/widgets/qfontcombobox.h ../gui/widgets/qframe.h ../gui/widgets/qgroupbox.h ../gui/widgets/qlabel.h ../gui/widgets/qlcdnumber.h ../gui/widgets/qlineedit.h ../gui/widgets/qmaccocoaviewcontainer_mac.h ../gui/widgets/qmacnativewidget_mac.h ../gui/widgets/qmainwindow.h ../gui/widgets/qmdiarea.h ../gui/widgets/qmdisubwindow.h ../gui/widgets/qmenu.h ../gui/widgets/qmenubar.h ../gui/widgets/qmenudata.h ../gui/widgets/qplaintextedit.h ../gui/widgets/qprintpreviewwidget.h ../gui/widgets/qprogressbar.h ../gui/widgets/qpushbutton.h ../gui/widgets/qradiobutton.h ../gui/widgets/qrubberband.h ../gui/widgets/qscrollarea.h ../gui/widgets/qscrollbar.h ../gui/widgets/qsizegrip.h ../gui/widgets/qslider.h ../gui/widgets/qspinbox.h ../gui/widgets/qsplashscreen.h ../gui/widgets/qsplitter.h ../gui/widgets/qstackedwidget.h ../gui/widgets/qstatusbar.h ../gui/widgets/qtabbar.h ../gui/widgets/qtabwidget.h ../gui/widgets/qtextbrowser.h ../gui/widgets/qtextedit.h ../gui/widgets/qtoolbar.h ../gui/widgets/qtoolbox.h ../gui/widgets/qtoolbutton.h ../gui/widgets/qvalidator.h ../gui/widgets/qworkspace.h ../gui/kernel/qaction.h ../gui/kernel/qactiongroup.h ../gui/kernel/qapplication.h ../gui/kernel/qboxlayout.h ../gui/kernel/qclipboard.h ../gui/kernel/qcursor.h ../gui/kernel/qdesktopwidget.h ../gui/kernel/qdrag.h ../gui/kernel/qevent.h ../gui/kernel/qformlayout.h ../gui/kernel/qgesture.h ../gui/kernel/qgesturerecognizer.h ../gui/kernel/qgridlayout.h ../gui/kernel/qguifunctions_wince.h ../gui/kernel/qkeysequence.h ../gui/kernel/qlayout.h ../gui/kernel/qlayoutitem.h ../gui/kernel/qmacdefines_mac.h ../gui/kernel/qmime.h ../gui/kernel/qpalette.h ../gui/kernel/qsessionmanager.h ../gui/kernel/qshortcut.h ../gui/kernel/qsizepolicy.h ../gui/kernel/qsound.h ../gui/kernel/qstackedlayout.h ../gui/kernel/qtooltip.h ../gui/kernel/qwhatsthis.h ../gui/kernel/qwidget.h ../gui/kernel/qwidgetaction.h ../gui/kernel/qwindowdefs.h ../gui/kernel/qwindowdefs_win.h ../gui/kernel/qx11embed_x11.h ../gui/kernel/qx11info_x11.h ../gui/painting/qbrush.h ../gui/painting/qcolor.h ../gui/painting/qcolormap.h ../gui/painting/qdrawutil.h ../gui/painting/qmatrix.h ../gui/painting/qpaintdevice.h ../gui/painting/qpaintengine.h ../gui/painting/qpainter.h ../gui/painting/qpainterpath.h ../gui/painting/qpen.h ../gui/painting/qpolygon.h ../gui/painting/qprintengine.h ../gui/painting/qprinter.h ../gui/painting/qprinterinfo.h ../gui/painting/qregion.h ../gui/painting/qrgb.h ../gui/painting/qstylepainter.h ../gui/painting/qtransform.h ../gui/painting/qwmatrix.h ../gui/symbian/qsymbianevent.h ../gui/styles/qcdestyle.h ../gui/styles/qcleanlooksstyle.h ../gui/styles/qcommonstyle.h ../gui/styles/qgtkstyle.h ../gui/styles/qmacstyle_mac.h ../gui/styles/qmotifstyle.h ../gui/styles/qplastiquestyle.h ../gui/styles/qproxystyle.h ../gui/styles/qs60style.h ../gui/styles/qstyle.h ../gui/styles/qstylefactory.h ../gui/styles/qstyleoption.h ../gui/styles/qstyleplugin.h ../gui/styles/qwindowscestyle.h ../gui/styles/qwindowsmobilestyle.h ../gui/styles/qwindowsstyle.h ../gui/styles/qwindowsvistastyle.h ../gui/styles/qwindowsxpstyle.h ../gui/math3d/qgenericmatrix.h ../gui/math3d/qmatrix4x4.h ../gui/math3d/qquaternion.h ../gui/math3d/qvector2d.h ../gui/math3d/qvector3d.h ../gui/math3d/qvector4d.h ../gui/inputmethod/qinputcontext.h ../gui/inputmethod/qinputcontextfactory.h ../gui/inputmethod/qinputcontextplugin.h ../gui/effects/qgraphicseffect.h ../gui/s60framework/qs60mainapplication.h ../gui/s60framework/qs60mainappui.h ../gui/s60framework/qs60maindocument.h ../gui/embedded/qcopchannel_qws.h ../gui/embedded/qdecoration_qws.h ../gui/embedded/qdecorationdefault_qws.h ../gui/embedded/qdecorationfactory_qws.h ../gui/embedded/qdecorationplugin_qws.h ../gui/embedded/qdecorationstyled_qws.h ../gui/embedded/qdecorationwindows_qws.h ../gui/embedded/qdirectpainter_qws.h ../gui/embedded/qkbd_qws.h ../gui/embedded/qkbddriverfactory_qws.h ../gui/embedded/qkbddriverplugin_qws.h ../gui/embedded/qkbdlinuxinput_qws.h ../gui/embedded/qkbdqnx_qws.h ../gui/embedded/qkbdtty_qws.h ../gui/embedded/qkbdum_qws.h ../gui/embedded/qkbdvfb_qws.h ../gui/embedded/qmouse_qws.h ../gui/embedded/qmousedriverfactory_qws.h ../gui/embedded/qmousedriverplugin_qws.h ../gui/embedded/qmouselinuxinput_qws.h ../gui/embedded/qmouselinuxtp_qws.h ../gui/embedded/qmousepc_qws.h ../gui/embedded/qmouseqnx_qws.h ../gui/embedded/qmousetslib_qws.h ../gui/embedded/qmousevfb_qws.h ../gui/embedded/qscreen_qws.h ../gui/embedded/qscreendriverfactory_qws.h ../gui/embedded/qscreendriverplugin_qws.h ../gui/embedded/qscreenlinuxfb_qws.h ../gui/embedded/qscreenproxy_qws.h ../gui/embedded/qscreenqnx_qws.h ../gui/embedded/qscreentransformed_qws.h ../gui/embedded/qscreenvfb_qws.h ../gui/embedded/qsoundqss_qws.h ../gui/embedded/qtransportauth_qws.h ../gui/embedded/qtransportauthdefs_qws.h ../gui/embedded/qvfbhdr.h ../gui/embedded/qwindowsystem_qws.h ../gui/embedded/qwscursor_qws.h ../gui/embedded/qwsdisplay_qws.h ../gui/embedded/qwsembedwidget.h ../gui/embedded/qwsevent_qws.h ../gui/embedded/qwsmanager_qws.h ../gui/embedded/qwsproperty_qws.h ../gui/embedded/qwsprotocolitem_qws.h ../gui/embedded/qwssocket_qws.h ../gui/embedded/qwsutils_qws.h ../gui/image/qbitmap.h ../gui/image/qicon.h ../gui/image/qiconengine.h ../gui/image/qiconengineplugin.h ../gui/image/qimage.h ../gui/image/qimageiohandler.h ../gui/image/qimagereader.h ../gui/image/qimagewriter.h ../gui/image/qmovie.h ../gui/image/qpicture.h ../gui/image/qpictureformatplugin.h ../gui/image/qpixmap.h ../gui/image/qpixmapcache.h ../gui/dialogs/qabstractpagesetupdialog.h ../gui/dialogs/qabstractprintdialog.h ../gui/dialogs/qcolordialog.h ../gui/dialogs/qdialog.h ../gui/dialogs/qerrormessage.h ../gui/dialogs/qfiledialog.h ../gui/dialogs/qfilesystemmodel.h ../gui/dialogs/qfontdialog.h ../gui/dialogs/qinputdialog.h ../gui/dialogs/qmessagebox.h ../gui/dialogs/qpagesetupdialog.h ../gui/dialogs/qprintdialog.h ../gui/dialogs/qprintpreviewdialog.h ../gui/dialogs/qprogressdialog.h ../gui/dialogs/qwizard.h ../gui/itemviews/qabstractitemdelegate.h ../gui/itemviews/qabstractitemview.h ../gui/itemviews/qabstractproxymodel.h ../gui/itemviews/qcolumnview.h ../gui/itemviews/qdatawidgetmapper.h ../gui/itemviews/qdirmodel.h ../gui/itemviews/qfileiconprovider.h ../gui/itemviews/qheaderview.h ../gui/itemviews/qitemdelegate.h ../gui/itemviews/qitemeditorfactory.h ../gui/itemviews/qitemselectionmodel.h ../gui/itemviews/qlistview.h ../gui/itemviews/qlistwidget.h ../gui/itemviews/qproxymodel.h ../gui/itemviews/qsortfilterproxymodel.h ../gui/itemviews/qstandarditemmodel.h ../gui/itemviews/qstringlistmodel.h ../gui/itemviews/qstyleditemdelegate.h ../gui/itemviews/qtableview.h ../gui/itemviews/qtablewidget.h ../gui/itemviews/qtreeview.h ../gui/itemviews/qtreewidget.h ../gui/itemviews/qtreewidgetitemiterator.h ../gui/accessible/qaccessible.h ../gui/accessible/qaccessible2.h ../gui/accessible/qaccessiblebridge.h ../gui/accessible/qaccessibleobject.h ../gui/accessible/qaccessibleplugin.h ../gui/accessible/qaccessiblewidget.h ../gui/util/qcompleter.h ../gui/util/qdesktopservices.h ../gui/util/qsystemtrayicon.h ../gui/util/qundogroup.h ../gui/util/qundostack.h ../gui/util/qundoview.h ../../include/QtGui/QtGui 
+SYNCQT.HEADER_CLASSES = ../../include/QtGui/QGraphicsAnchor ../../include/QtGui/QGraphicsAnchorLayout ../../include/QtGui/QGraphicsGridLayout ../../include/QtGui/QGraphicsItem ../../include/QtGui/QGraphicsObject ../../include/QtGui/QAbstractGraphicsShapeItem ../../include/QtGui/QGraphicsPathItem ../../include/QtGui/QGraphicsRectItem ../../include/QtGui/QGraphicsEllipseItem ../../include/QtGui/QGraphicsPolygonItem ../../include/QtGui/QGraphicsLineItem ../../include/QtGui/QGraphicsPixmapItem ../../include/QtGui/QGraphicsTextItem ../../include/QtGui/QGraphicsSimpleTextItem ../../include/QtGui/QGraphicsItemGroup ../../include/QtGui/QGraphicsItemAnimation ../../include/QtGui/QGraphicsLayout ../../include/QtGui/QGraphicsLayoutItem ../../include/QtGui/QGraphicsLinearLayout ../../include/QtGui/QGraphicsProxyWidget ../../include/QtGui/QGraphicsScene ../../include/QtGui/QGraphicsSceneEvent ../../include/QtGui/QGraphicsSceneMouseEvent ../../include/QtGui/QGraphicsSceneWheelEvent ../../include/QtGui/QGraphicsSceneContextMenuEvent ../../include/QtGui/QGraphicsSceneHoverEvent ../../include/QtGui/QGraphicsSceneHelpEvent ../../include/QtGui/QGraphicsSceneDragDropEvent ../../include/QtGui/QGraphicsSceneResizeEvent ../../include/QtGui/QGraphicsSceneMoveEvent ../../include/QtGui/QGraphicsTransform ../../include/QtGui/QGraphicsScale ../../include/QtGui/QGraphicsRotation ../../include/QtGui/QGraphicsView ../../include/QtGui/QGraphicsWidget ../../include/QtGui/QKeyEventTransition ../../include/QtGui/QMouseEventTransition ../../include/QtGui/QFontEngineInfo ../../include/QtGui/QFontEngineFactoryInterface ../../include/QtGui/QFontEnginePlugin ../../include/QtGui/QAbstractFontEngine ../../include/QtGui/QAbstractTextDocumentLayout ../../include/QtGui/QTextObjectInterface ../../include/QtGui/QFont ../../include/QtGui/QFontDatabase ../../include/QtGui/QFontInfo ../../include/QtGui/QFontMetrics ../../include/QtGui/QFontMetricsF ../../include/QtGui/QSyntaxHighlighter ../../include/QtGui/QTextCursor ../../include/QtGui/QAbstractUndoItem ../../include/QtGui/QTextDocument ../../include/QtGui/QTextDocumentFragment ../../include/QtGui/QTextDocumentWriter ../../include/QtGui/QTextLength ../../include/QtGui/QTextFormat ../../include/QtGui/QTextCharFormat ../../include/QtGui/QTextBlockFormat ../../include/QtGui/QTextListFormat ../../include/QtGui/QTextImageFormat ../../include/QtGui/QTextFrameFormat ../../include/QtGui/QTextTableFormat ../../include/QtGui/QTextTableCellFormat ../../include/QtGui/QTextInlineObject ../../include/QtGui/QTextLayout ../../include/QtGui/QTextLine ../../include/QtGui/QTextList ../../include/QtGui/QTextObject ../../include/QtGui/QTextBlockGroup ../../include/QtGui/QTextFrameLayoutData ../../include/QtGui/QTextFrame ../../include/QtGui/QTextBlockUserData ../../include/QtGui/QTextBlock ../../include/QtGui/QTextFragment ../../include/QtGui/QTextOption ../../include/QtGui/QTextTableCell ../../include/QtGui/QTextTable ../../include/QtGui/QAbstractButton ../../include/QtGui/QAbstractScrollArea ../../include/QtGui/QAbstractSlider ../../include/QtGui/QAbstractSpinBox ../../include/QtGui/QButtonGroup ../../include/QtGui/QCalendarWidget ../../include/QtGui/QCheckBox ../../include/QtGui/QComboBox ../../include/QtGui/QCommandLinkButton ../../include/QtGui/QDateTimeEdit ../../include/QtGui/QTimeEdit ../../include/QtGui/QDateEdit ../../include/QtGui/QDial ../../include/QtGui/QDialogButtonBox ../../include/QtGui/QDockWidget ../../include/QtGui/QFocusFrame ../../include/QtGui/QFontComboBox ../../include/QtGui/QFrame ../../include/QtGui/QGroupBox ../../include/QtGui/QLabel ../../include/QtGui/QLCDNumber ../../include/QtGui/QLineEdit ../../include/QtGui/QMacCocoaViewContainer ../../include/QtGui/QMacNativeWidget ../../include/QtGui/QMainWindow ../../include/QtGui/QMdiArea ../../include/QtGui/QMdiSubWindow ../../include/QtGui/QMenu ../../include/QtGui/QMenuBar ../../include/QtGui/QMenuItem ../../include/QtGui/QPlainTextEdit ../../include/QtGui/QPlainTextDocumentLayout ../../include/QtGui/QPrintPreviewWidget ../../include/QtGui/QProgressBar ../../include/QtGui/QPushButton ../../include/QtGui/QRadioButton ../../include/QtGui/QRubberBand ../../include/QtGui/QScrollArea ../../include/QtGui/QScrollBar ../../include/QtGui/QSizeGrip ../../include/QtGui/QSlider ../../include/QtGui/QSpinBox ../../include/QtGui/QDoubleSpinBox ../../include/QtGui/QSplashScreen ../../include/QtGui/QSplitter ../../include/QtGui/QSplitterHandle ../../include/QtGui/QStackedWidget ../../include/QtGui/QStatusBar ../../include/QtGui/QTabBar ../../include/QtGui/QTabWidget ../../include/QtGui/QTextBrowser ../../include/QtGui/QTextEdit ../../include/QtGui/QToolBar ../../include/QtGui/QToolBox ../../include/QtGui/QToolButton ../../include/QtGui/QValidator ../../include/QtGui/QIntValidator ../../include/QtGui/QDoubleValidator ../../include/QtGui/QRegExpValidator ../../include/QtGui/QWorkspace ../../include/QtGui/QAction ../../include/QtGui/QActionGroup ../../include/QtGui/QApplication ../../include/QtGui/QBoxLayout ../../include/QtGui/QHBoxLayout ../../include/QtGui/QVBoxLayout ../../include/QtGui/QClipboard ../../include/QtGui/QCursor ../../include/QtGui/QCursorShape ../../include/QtGui/QDesktopWidget ../../include/QtGui/QDrag ../../include/QtGui/QtEvents ../../include/QtGui/QInputEvent ../../include/QtGui/QMouseEvent ../../include/QtGui/QHoverEvent ../../include/QtGui/QWheelEvent ../../include/QtGui/QTabletEvent ../../include/QtGui/QKeyEvent ../../include/QtGui/QFocusEvent ../../include/QtGui/QPaintEvent ../../include/QtGui/QUpdateLaterEvent ../../include/QtGui/QMoveEvent ../../include/QtGui/QResizeEvent ../../include/QtGui/QCloseEvent ../../include/QtGui/QIconDragEvent ../../include/QtGui/QShowEvent ../../include/QtGui/QHideEvent ../../include/QtGui/QContextMenuEvent ../../include/QtGui/QInputMethodEvent ../../include/QtGui/QDropEvent ../../include/QtGui/QDragMoveEvent ../../include/QtGui/QDragEnterEvent ../../include/QtGui/QDragResponseEvent ../../include/QtGui/QDragLeaveEvent ../../include/QtGui/QHelpEvent ../../include/QtGui/QStatusTipEvent ../../include/QtGui/QWhatsThisClickedEvent ../../include/QtGui/QActionEvent ../../include/QtGui/QFileOpenEvent ../../include/QtGui/QToolBarChangeEvent ../../include/QtGui/QShortcutEvent ../../include/QtGui/QClipboardEvent ../../include/QtGui/QWindowStateChangeEvent ../../include/QtGui/QMenubarUpdatedEvent ../../include/QtGui/QTouchEvent ../../include/QtGui/QGestureEvent ../../include/QtGui/QFormLayout ../../include/QtGui/QGesture ../../include/QtGui/QPanGesture ../../include/QtGui/QPinchGesture ../../include/QtGui/QSwipeGesture ../../include/QtGui/QTapGesture ../../include/QtGui/QTapAndHoldGesture ../../include/QtGui/QGestureRecognizer ../../include/QtGui/QGridLayout ../../include/QtGui/QKeySequence ../../include/QtGui/QLayoutIterator ../../include/QtGui/QLayout ../../include/QtGui/QLayoutItem ../../include/QtGui/QSpacerItem ../../include/QtGui/QWidgetItem ../../include/QtGui/QWidgetItemV2 ../../include/QtGui/QMimeSource ../../include/QtGui/QWindowsMime ../../include/QtGui/QMacMime ../../include/QtGui/QMacPasteboardMime ../../include/QtGui/QPalette ../../include/QtGui/QColorGroup ../../include/QtGui/QSessionManager ../../include/QtGui/QShortcut ../../include/QtGui/QSizePolicy ../../include/QtGui/QSound ../../include/QtGui/QStackedLayout ../../include/QtGui/QToolTip ../../include/QtGui/QWhatsThis ../../include/QtGui/QWidgetData ../../include/QtGui/QWidget ../../include/QtGui/QWidgetAction ../../include/QtGui/QWidgetList ../../include/QtGui/QWidgetMapper ../../include/QtGui/QWidgetSet ../../include/QtGui/QX11EmbedWidget ../../include/QtGui/QX11EmbedContainer ../../include/QtGui/QX11Info ../../include/QtGui/QBrush ../../include/QtGui/QBrushData ../../include/QtGui/QGradientStop ../../include/QtGui/QGradientStops ../../include/QtGui/QGradient ../../include/QtGui/QLinearGradient ../../include/QtGui/QRadialGradient ../../include/QtGui/QConicalGradient ../../include/QtGui/QColor ../../include/QtGui/QColormap ../../include/QtGui/QTileRules ../../include/QtGui/QMatrix ../../include/QtGui/QPaintDevice ../../include/QtGui/QTextItem ../../include/QtGui/QPaintEngine ../../include/QtGui/QPaintEngineState ../../include/QtGui/QPainter ../../include/QtGui/QPainterPath ../../include/QtGui/QPainterPathPrivate ../../include/QtGui/QPainterPathStroker ../../include/QtGui/QPen ../../include/QtGui/QPolygon ../../include/QtGui/QPolygonF ../../include/QtGui/QPrintEngine ../../include/QtGui/QPrinter ../../include/QtGui/QPrinterInfo ../../include/QtGui/QRegion ../../include/QtGui/QRgb ../../include/QtGui/QStylePainter ../../include/QtGui/QTransform ../../include/QtGui/QWMatrix ../../include/QtGui/QSymbianEvent ../../include/QtGui/QCDEStyle ../../include/QtGui/QCleanlooksStyle ../../include/QtGui/QCommonStyle ../../include/QtGui/QGtkStyle ../../include/QtGui/QMacStyle ../../include/QtGui/QMotifStyle ../../include/QtGui/QPlastiqueStyle ../../include/QtGui/QProxyStyle ../../include/QtGui/QS60Style ../../include/QtGui/QStyle ../../include/QtGui/QStyleFactory ../../include/QtGui/QStyleOption ../../include/QtGui/QStyleOptionFocusRect ../../include/QtGui/QStyleOptionFrame ../../include/QtGui/QStyleOptionFrameV2 ../../include/QtGui/QStyleOptionFrameV3 ../../include/QtGui/QStyleOptionTabWidgetFrame ../../include/QtGui/QStyleOptionTabWidgetFrameV2 ../../include/QtGui/QStyleOptionTabBarBase ../../include/QtGui/QStyleOptionTabBarBaseV2 ../../include/QtGui/QStyleOptionHeader ../../include/QtGui/QStyleOptionButton ../../include/QtGui/QStyleOptionTab ../../include/QtGui/QStyleOptionTabV2 ../../include/QtGui/QStyleOptionTabV3 ../../include/QtGui/QStyleOptionToolBar ../../include/QtGui/QStyleOptionProgressBar ../../include/QtGui/QStyleOptionProgressBarV2 ../../include/QtGui/QStyleOptionMenuItem ../../include/QtGui/QStyleOptionQ3ListViewItem ../../include/QtGui/QStyleOptionQ3DockWindow ../../include/QtGui/QStyleOptionDockWidget ../../include/QtGui/QStyleOptionDockWidgetV2 ../../include/QtGui/QStyleOptionViewItem ../../include/QtGui/QStyleOptionViewItemV2 ../../include/QtGui/QStyleOptionViewItemV3 ../../include/QtGui/QStyleOptionViewItemV4 ../../include/QtGui/QStyleOptionToolBox ../../include/QtGui/QStyleOptionToolBoxV2 ../../include/QtGui/QStyleOptionRubberBand ../../include/QtGui/QStyleOptionComplex ../../include/QtGui/QStyleOptionSlider ../../include/QtGui/QStyleOptionSpinBox ../../include/QtGui/QStyleOptionQ3ListView ../../include/QtGui/QStyleOptionToolButton ../../include/QtGui/QStyleOptionComboBox ../../include/QtGui/QStyleOptionTitleBar ../../include/QtGui/QStyleOptionGroupBox ../../include/QtGui/QStyleOptionSizeGrip ../../include/QtGui/QStyleOptionGraphicsItem ../../include/QtGui/QStyleHintReturn ../../include/QtGui/QStyleHintReturnMask ../../include/QtGui/QStyleHintReturnVariant ../../include/QtGui/QStyleFactoryInterface ../../include/QtGui/QStylePlugin ../../include/QtGui/QWindowsCEStyle ../../include/QtGui/QWindowsMobileStyle ../../include/QtGui/QWindowsStyle ../../include/QtGui/QWindowsVistaStyle ../../include/QtGui/QWindowsXPStyle ../../include/QtGui/QGenericMatrix ../../include/QtGui/QMatrix2x2 ../../include/QtGui/QMatrix2x3 ../../include/QtGui/QMatrix2x4 ../../include/QtGui/QMatrix3x2 ../../include/QtGui/QMatrix3x3 ../../include/QtGui/QMatrix3x4 ../../include/QtGui/QMatrix4x2 ../../include/QtGui/QMatrix4x3 ../../include/QtGui/QMatrix4x4 ../../include/QtGui/QQuaternion ../../include/QtGui/QVector2D ../../include/QtGui/QVector3D ../../include/QtGui/QVector4D ../../include/QtGui/QInputContext ../../include/QtGui/QInputContextFactory ../../include/QtGui/QInputContextFactoryInterface ../../include/QtGui/QInputContextPlugin ../../include/QtGui/QGraphicsEffect ../../include/QtGui/QGraphicsColorizeEffect ../../include/QtGui/QGraphicsBlurEffect ../../include/QtGui/QGraphicsDropShadowEffect ../../include/QtGui/QGraphicsOpacityEffect ../../include/QtGui/QS60MainApplication ../../include/QtGui/QS60MainAppUi ../../include/QtGui/QS60MainDocument ../../include/QtGui/QCopChannel ../../include/QtGui/QDecorationAction ../../include/QtGui/QDecoration ../../include/QtGui/QDecorationDefault ../../include/QtGui/QDecorationFactory ../../include/QtGui/QDecorationFactoryInterface ../../include/QtGui/QDecorationPlugin ../../include/QtGui/QDecorationStyled ../../include/QtGui/QDecorationWindows ../../include/QtGui/QDirectPainter ../../include/QtGui/QWSKeyboardHandler ../../include/QtGui/QKbdDriverFactory ../../include/QtGui/QWSKeyboardHandlerFactoryInterface ../../include/QtGui/QKbdDriverPlugin ../../include/QtGui/QWSLinuxInputKeyboardHandler ../../include/QtGui/QWSQnxKeyboardHandler ../../include/QtGui/QWSTtyKeyboardHandler ../../include/QtGui/QWSUmKeyboardHandler ../../include/QtGui/QVFbKeyboardHandler ../../include/QtGui/QWSPointerCalibrationData ../../include/QtGui/QWSMouseHandler ../../include/QtGui/QWSCalibratedMouseHandler ../../include/QtGui/QMouseDriverFactory ../../include/QtGui/QWSMouseHandlerFactoryInterface ../../include/QtGui/QMouseDriverPlugin ../../include/QtGui/QWSLinuxInputMouseHandler ../../include/QtGui/QWSLinuxTPMouseHandler ../../include/QtGui/QWSPcMouseHandler ../../include/QtGui/QQnxMouseHandler ../../include/QtGui/QWSTslibMouseHandler ../../include/QtGui/QVFbMouseHandler ../../include/QtGui/QScreenCursor ../../include/QtGui/QPoolEntry ../../include/QtGui/QScreen ../../include/QtGui/QScreenDriverFactory ../../include/QtGui/QScreenDriverFactoryInterface ../../include/QtGui/QScreenDriverPlugin ../../include/QtGui/QLinuxFb_Shared ../../include/QtGui/QLinuxFbScreen ../../include/QtGui/QProxyScreenCursor ../../include/QtGui/QProxyScreen ../../include/QtGui/QQnxScreen ../../include/QtGui/QTransformedScreen ../../include/QtGui/QVFbScreen ../../include/QtGui/QWSSoundServer ../../include/QtGui/QWSSoundClient ../../include/QtGui/QWSSoundServerSocket ../../include/QtGui/QTransportAuth ../../include/QtGui/QAuthDevice ../../include/QtGui/QVFbHeader ../../include/QtGui/QVFbKeyData ../../include/QtGui/QWSInternalWindowInfo ../../include/QtGui/QWSScreenSaver ../../include/QtGui/QWSWindow ../../include/QtGui/QWSServer ../../include/QtGui/QWSInputMethod ../../include/QtGui/QWSCursorMap ../../include/QtGui/QWSClient ../../include/QtGui/QWSCursor ../../include/QtGui/QWSWindowInfo ../../include/QtGui/QWSDisplay ../../include/QtGui/QWSEmbedWidget ../../include/QtGui/QWSEvent ../../include/QtGui/QWSManager ../../include/QtGui/QWSPropertyManager ../../include/QtGui/QWSProtocolItem ../../include/QtGui/QWSSocket ../../include/QtGui/QWSServerSocket ../../include/QtGui/QBitmap ../../include/QtGui/QIcon ../../include/QtGui/QIconSet ../../include/QtGui/QIconEngine ../../include/QtGui/QIconEngineV2 ../../include/QtGui/QIconEngineFactoryInterface ../../include/QtGui/QIconEnginePlugin ../../include/QtGui/QIconEngineFactoryInterfaceV2 ../../include/QtGui/QIconEnginePluginV2 ../../include/QtGui/QImageTextKeyLang ../../include/QtGui/QImage ../../include/QtGui/QImageIOHandler ../../include/QtGui/QImageIOHandlerFactoryInterface ../../include/QtGui/QImageIOPlugin ../../include/QtGui/QImageReader ../../include/QtGui/QImageWriter ../../include/QtGui/QMovie ../../include/QtGui/QPicture ../../include/QtGui/QPictureIO ../../include/QtGui/QPictureFormatInterface ../../include/QtGui/QPictureFormatPlugin ../../include/QtGui/QPixmap ../../include/QtGui/QPixmapCache ../../include/QtGui/QAbstractPageSetupDialog ../../include/QtGui/QAbstractPrintDialog ../../include/QtGui/QColorDialog ../../include/QtGui/QDialog ../../include/QtGui/QErrorMessage ../../include/QtGui/QFileDialog ../../include/QtGui/QFileSystemModel ../../include/QtGui/QFontDialog ../../include/QtGui/QInputDialog ../../include/QtGui/QMessageBox ../../include/QtGui/QPageSetupDialog ../../include/QtGui/QUnixPrintWidget ../../include/QtGui/QPrintDialog ../../include/QtGui/QPrintPreviewDialog ../../include/QtGui/QProgressDialog ../../include/QtGui/QWizard ../../include/QtGui/QWizardPage ../../include/QtGui/QAbstractItemDelegate ../../include/QtGui/QAbstractItemView ../../include/QtGui/QAbstractProxyModel ../../include/QtGui/QColumnView ../../include/QtGui/QDataWidgetMapper ../../include/QtGui/QDirModel ../../include/QtGui/QFileIconProvider ../../include/QtGui/QHeaderView ../../include/QtGui/QItemDelegate ../../include/QtGui/QItemEditorCreatorBase ../../include/QtGui/QItemEditorCreator ../../include/QtGui/QStandardItemEditorCreator ../../include/QtGui/QItemEditorFactory ../../include/QtGui/QItemSelectionRange ../../include/QtGui/QItemSelectionModel ../../include/QtGui/QItemSelection ../../include/QtGui/QListView ../../include/QtGui/QListWidgetItem ../../include/QtGui/QListWidget ../../include/QtGui/QProxyModel ../../include/QtGui/QSortFilterProxyModel ../../include/QtGui/QStandardItem ../../include/QtGui/QStandardItemModel ../../include/QtGui/QStringListModel ../../include/QtGui/QStyledItemDelegate ../../include/QtGui/QTableView ../../include/QtGui/QTableWidgetSelectionRange ../../include/QtGui/QTableWidgetItem ../../include/QtGui/QTableWidget ../../include/QtGui/QTreeView ../../include/QtGui/QTreeWidgetItem ../../include/QtGui/QTreeWidget ../../include/QtGui/QTreeWidgetItemIterator ../../include/QtGui/QAccessible ../../include/QtGui/QAccessibleInterface ../../include/QtGui/QAccessibleInterfaceEx ../../include/QtGui/QAccessibleEvent ../../include/QtGui/QAccessible2Interface ../../include/QtGui/QAccessibleTextInterface ../../include/QtGui/QAccessibleEditableTextInterface ../../include/QtGui/QAccessibleSimpleEditableTextInterface ../../include/QtGui/QAccessibleValueInterface ../../include/QtGui/QAccessibleTableInterface ../../include/QtGui/QAccessibleActionInterface ../../include/QtGui/QAccessibleImageInterface ../../include/QtGui/QAccessibleBridge ../../include/QtGui/QAccessibleBridgeFactoryInterface ../../include/QtGui/QAccessibleBridgePlugin ../../include/QtGui/QAccessibleObject ../../include/QtGui/QAccessibleObjectEx ../../include/QtGui/QAccessibleApplication ../../include/QtGui/QAccessibleFactoryInterface ../../include/QtGui/QAccessiblePlugin ../../include/QtGui/QAccessibleWidget ../../include/QtGui/QAccessibleWidgetEx ../../include/QtGui/QCompleter ../../include/QtGui/QDesktopServices ../../include/QtGui/QSystemTrayIcon ../../include/QtGui/QUndoGroup ../../include/QtGui/QUndoCommand ../../include/QtGui/QUndoStack ../../include/QtGui/QUndoView 
+SYNCQT.PRIVATE_HEADER_FILES = ../gui/graphicsview/qgraph_p.h ../gui/graphicsview/qgraphicsanchorlayout_p.h ../gui/graphicsview/qgraphicsitem_p.h ../gui/graphicsview/qgraphicslayout_p.h ../gui/graphicsview/qgraphicslayoutitem_p.h ../gui/graphicsview/qgraphicsproxywidget_p.h ../gui/graphicsview/qgraphicsscene_bsp_p.h ../gui/graphicsview/qgraphicsscene_p.h ../gui/graphicsview/qgraphicsscenebsptreeindex_p.h ../gui/graphicsview/qgraphicssceneindex_p.h ../gui/graphicsview/qgraphicsscenelinearindex_p.h ../gui/graphicsview/qgraphicstransform_p.h ../gui/graphicsview/qgraphicsview_p.h ../gui/graphicsview/qgraphicswidget_p.h ../gui/graphicsview/qgridlayoutengine_p.h ../gui/graphicsview/qsimplex_p.h ../gui/statemachine/qbasickeyeventtransition_p.h ../gui/statemachine/qbasicmouseeventtransition_p.h ../gui/text/qabstractfontengine_p.h ../gui/text/qabstracttextdocumentlayout_p.h ../gui/text/qcssparser_p.h ../gui/text/qfont_p.h ../gui/text/qfontengine_ft_p.h ../gui/text/qfontengine_p.h ../gui/text/qfontengine_qpf_p.h ../gui/text/qfontengine_s60_p.h ../gui/text/qfontengine_win_p.h ../gui/text/qfontengine_x11_p.h ../gui/text/qfontengineglyphcache_p.h ../gui/text/qfontsubset_p.h ../gui/text/qfragmentmap_p.h ../gui/text/qtextcontrol_p.h ../gui/text/qtextcontrol_p_p.h ../gui/text/qtextcursor_p.h ../gui/text/qtextdocument_p.h ../gui/text/qtextdocumentfragment_p.h ../gui/text/qtextdocumentlayout_p.h ../gui/text/qtextengine_p.h ../gui/text/qtextformat_p.h ../gui/text/qtexthtmlparser_p.h ../gui/text/qtextimagehandler_p.h ../gui/text/qtextobject_p.h ../gui/text/qtextodfwriter_p.h ../gui/text/qtexttable_p.h ../gui/text/qzipreader_p.h ../gui/text/qzipwriter_p.h ../gui/widgets/qabstractbutton_p.h ../gui/widgets/qabstractscrollarea_p.h ../gui/widgets/qabstractslider_p.h ../gui/widgets/qabstractspinbox_p.h ../gui/widgets/qcalendartextnavigator_p.h ../gui/widgets/qcocoamenu_mac_p.h ../gui/widgets/qcocoatoolbardelegate_mac_p.h ../gui/widgets/qcombobox_p.h ../gui/widgets/qdatetimeedit_p.h ../gui/widgets/qdockarealayout_p.h ../gui/widgets/qdockwidget_p.h ../gui/widgets/qeffects_p.h ../gui/widgets/qframe_p.h ../gui/widgets/qlabel_p.h ../gui/widgets/qlinecontrol_p.h ../gui/widgets/qlineedit_p.h ../gui/widgets/qmainwindowlayout_p.h ../gui/widgets/qmdiarea_p.h ../gui/widgets/qmdisubwindow_p.h ../gui/widgets/qmenu_p.h ../gui/widgets/qmenu_wince_resource_p.h ../gui/widgets/qmenubar_p.h ../gui/widgets/qplaintextedit_p.h ../gui/widgets/qpushbutton_p.h ../gui/widgets/qscrollarea_p.h ../gui/widgets/qsplitter_p.h ../gui/widgets/qtabbar_p.h ../gui/widgets/qtextedit_p.h ../gui/widgets/qtoolbar_p.h ../gui/widgets/qtoolbararealayout_p.h ../gui/widgets/qtoolbarextension_p.h ../gui/widgets/qtoolbarlayout_p.h ../gui/widgets/qtoolbarseparator_p.h ../gui/widgets/qwidgetanimator_p.h ../gui/widgets/qwidgetresizehandler_p.h ../gui/kernel/qaction_p.h ../gui/kernel/qapplication_p.h ../gui/kernel/qclipboard_p.h ../gui/kernel/qcocoaapplication_mac_p.h ../gui/kernel/qcocoaapplicationdelegate_mac_p.h ../gui/kernel/qcocoamenuloader_mac_p.h ../gui/kernel/qcocoapanel_mac_p.h ../gui/kernel/qcocoasharedwindowmethods_mac_p.h ../gui/kernel/qcocoaview_mac_p.h ../gui/kernel/qcocoawindow_mac_p.h ../gui/kernel/qcocoawindowcustomthemeframe_mac_p.h ../gui/kernel/qcocoawindowdelegate_mac_p.h ../gui/kernel/qcursor_p.h ../gui/kernel/qdesktopwidget_mac_p.h ../gui/kernel/qdnd_p.h ../gui/kernel/qevent_p.h ../gui/kernel/qeventdispatcher_glib_qws_p.h ../gui/kernel/qeventdispatcher_mac_p.h ../gui/kernel/qeventdispatcher_qws_p.h ../gui/kernel/qeventdispatcher_s60_p.h ../gui/kernel/qeventdispatcher_x11_p.h ../gui/kernel/qgesture_p.h ../gui/kernel/qgesturemanager_p.h ../gui/kernel/qguieventdispatcher_glib_p.h ../gui/kernel/qguiplatformplugin_p.h ../gui/kernel/qkde_p.h ../gui/kernel/qkeymapper_p.h ../gui/kernel/qkeysequence_p.h ../gui/kernel/qlayout_p.h ../gui/kernel/qlayoutengine_p.h ../gui/kernel/qmacgesturerecognizer_mac_p.h ../gui/kernel/qmultitouch_mac_p.h ../gui/kernel/qnsframeview_mac_p.h ../gui/kernel/qnsthemeframe_mac_p.h ../gui/kernel/qnstitledframe_mac_p.h ../gui/kernel/qshortcutmap_p.h ../gui/kernel/qsoftkeymanager_common_p.h ../gui/kernel/qsoftkeymanager_p.h ../gui/kernel/qsoftkeymanager_s60_p.h ../gui/kernel/qsound_p.h ../gui/kernel/qstandardgestures_p.h ../gui/kernel/qt_cocoa_helpers_mac_p.h ../gui/kernel/qt_gui_pch.h ../gui/kernel/qt_mac_p.h ../gui/kernel/qt_s60_p.h ../gui/kernel/qt_x11_p.h ../gui/kernel/qwidget_p.h ../gui/kernel/qwidgetaction_p.h ../gui/kernel/qwinnativepangesturerecognizer_win_p.h ../gui/painting/qbackingstore_p.h ../gui/painting/qbezier_p.h ../gui/painting/qcolor_p.h ../gui/painting/qcssutil_p.h ../gui/painting/qcups_p.h ../gui/painting/qdatabuffer_p.h ../gui/painting/qdrawhelper_armv6_p.h ../gui/painting/qdrawhelper_mmx_p.h ../gui/painting/qdrawhelper_neon_p.h ../gui/painting/qdrawhelper_p.h ../gui/painting/qdrawhelper_sse_p.h ../gui/painting/qdrawhelper_x86_p.h ../gui/painting/qemulationpaintengine_p.h ../gui/painting/qfixed_p.h ../gui/painting/qgraphicssystem_mac_p.h ../gui/painting/qgraphicssystem_p.h ../gui/painting/qgraphicssystem_qws_p.h ../gui/painting/qgraphicssystem_raster_p.h ../gui/painting/qgraphicssystemfactory_p.h ../gui/painting/qgraphicssystemplugin_p.h ../gui/painting/qgrayraster_p.h ../gui/painting/qimagescale_p.h ../gui/painting/qmath_p.h ../gui/painting/qmemrotate_p.h ../gui/painting/qoutlinemapper_p.h ../gui/painting/qpaintbuffer_p.h ../gui/painting/qpaintengine_alpha_p.h ../gui/painting/qpaintengine_mac_p.h ../gui/painting/qpaintengine_p.h ../gui/painting/qpaintengine_preview_p.h ../gui/painting/qpaintengine_raster_p.h ../gui/painting/qpaintengine_s60_p.h ../gui/painting/qpaintengine_x11_p.h ../gui/painting/qpaintengineex_p.h ../gui/painting/qpainter_p.h ../gui/painting/qpainterpath_p.h ../gui/painting/qpathclipper_p.h ../gui/painting/qpdf_p.h ../gui/painting/qpen_p.h ../gui/painting/qpolygonclipper_p.h ../gui/painting/qprintengine_mac_p.h ../gui/painting/qprintengine_pdf_p.h ../gui/painting/qprintengine_ps_p.h ../gui/painting/qprintengine_qws_p.h ../gui/painting/qprintengine_win_p.h ../gui/painting/qprinter_p.h ../gui/painting/qprinterinfo_unix_p.h ../gui/painting/qrasterdefs_p.h ../gui/painting/qrasterizer_p.h ../gui/painting/qstroker_p.h ../gui/painting/qtessellator_p.h ../gui/painting/qtextureglyphcache_p.h ../gui/painting/qvectorpath_p.h ../gui/painting/qwindowsurface_mac_p.h ../gui/painting/qwindowsurface_p.h ../gui/painting/qwindowsurface_qws_p.h ../gui/painting/qwindowsurface_raster_p.h ../gui/painting/qwindowsurface_s60_p.h ../gui/painting/qwindowsurface_x11_p.h ../gui/egl/qegl_p.h ../gui/egl/qeglproperties_p.h ../gui/styles/qcleanlooksstyle_p.h ../gui/styles/qcommonstyle_p.h ../gui/styles/qcommonstylepixmaps_p.h ../gui/styles/qgtkpainter_p.h ../gui/styles/qgtkstyle_p.h ../gui/styles/qmacstylepixmaps_mac_p.h ../gui/styles/qmotifstyle_p.h ../gui/styles/qproxystyle_p.h ../gui/styles/qs60style_p.h ../gui/styles/qstyle_p.h ../gui/styles/qstylehelper_p.h ../gui/styles/qstylesheetstyle_p.h ../gui/styles/qwindowscestyle_p.h ../gui/styles/qwindowsmobilestyle_p.h ../gui/styles/qwindowsstyle_p.h ../gui/styles/qwindowsvistastyle_p.h ../gui/styles/qwindowsxpstyle_p.h ../gui/inputmethod/qcoefepinputcontext_p.h ../gui/inputmethod/qinputcontext_p.h ../gui/inputmethod/qmacinputcontext_p.h ../gui/inputmethod/qwininputcontext_p.h ../gui/inputmethod/qwsinputcontext_p.h ../gui/inputmethod/qximinputcontext_p.h ../gui/effects/qgraphicseffect_p.h ../gui/s60framework/qs60mainapplication_p.h ../gui/embedded/qkbd_defaultmap_qws_p.h ../gui/embedded/qkbd_qws_p.h ../gui/embedded/qlock_p.h ../gui/embedded/qscreenmulti_qws_p.h ../gui/embedded/qtransportauth_qws_p.h ../gui/embedded/qunixsocket_p.h ../gui/embedded/qunixsocketserver_p.h ../gui/embedded/qwindowsystem_p.h ../gui/embedded/qwscommand_qws_p.h ../gui/embedded/qwsdisplay_qws_p.h ../gui/embedded/qwslock_p.h ../gui/embedded/qwsmanager_p.h ../gui/embedded/qwssharedmemory_p.h ../gui/embedded/qwssignalhandler_p.h ../gui/image/qbmphandler_p.h ../gui/image/qicon_p.h ../gui/image/qiconloader_p.h ../gui/image/qimage_p.h ../gui/image/qimagepixmapcleanuphooks_p.h ../gui/image/qnativeimage_p.h ../gui/image/qpaintengine_pic_p.h ../gui/image/qpicture_p.h ../gui/image/qpixmap_mac_p.h ../gui/image/qpixmap_raster_p.h ../gui/image/qpixmap_s60_p.h ../gui/image/qpixmap_x11_p.h ../gui/image/qpixmapcache_p.h ../gui/image/qpixmapdata_p.h ../gui/image/qpixmapdatafactory_p.h ../gui/image/qpixmapfilter_p.h ../gui/image/qpnghandler_p.h ../gui/image/qppmhandler_p.h ../gui/image/qxbmhandler_p.h ../gui/image/qxpmhandler_p.h ../gui/dialogs/qabstractpagesetupdialog_p.h ../gui/dialogs/qabstractprintdialog_p.h ../gui/dialogs/qcolordialog_p.h ../gui/dialogs/qdialog_p.h ../gui/dialogs/qfiledialog_p.h ../gui/dialogs/qfileinfogatherer_p.h ../gui/dialogs/qfilesystemmodel_p.h ../gui/dialogs/qfontdialog_p.h ../gui/dialogs/qfscompleter_p.h ../gui/dialogs/qpagesetupdialog_unix_p.h ../gui/dialogs/qsidebar_p.h ../gui/dialogs/qwizard_win_p.h ../gui/itemviews/qabstractitemview_p.h ../gui/itemviews/qabstractproxymodel_p.h ../gui/itemviews/qbsptree_p.h ../gui/itemviews/qcolumnview_p.h ../gui/itemviews/qcolumnviewgrip_p.h ../gui/itemviews/qheaderview_p.h ../gui/itemviews/qitemeditorfactory_p.h ../gui/itemviews/qitemselectionmodel_p.h ../gui/itemviews/qlistview_p.h ../gui/itemviews/qlistwidget_p.h ../gui/itemviews/qproxymodel_p.h ../gui/itemviews/qstandarditemmodel_p.h ../gui/itemviews/qtableview_p.h ../gui/itemviews/qtablewidget_p.h ../gui/itemviews/qtreeview_p.h ../gui/itemviews/qtreewidget_p.h ../gui/itemviews/qtreewidgetitemiterator_p.h ../gui/itemviews/qwidgetitemdata_p.h ../gui/accessible/qaccessible_mac_p.h ../gui/util/qcompleter_p.h ../gui/util/qsystemtrayicon_p.h ../gui/util/qundostack_p.h 
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtGui/QtGui qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtGui/QtGui
--- qt-everywhere-opensource-src-4.6.2/include/QtGui/QtGui	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtGui/QtGui	2010-02-23 14:51:01.863613554 +0100
@@ -1,24 +1,37 @@
 #ifndef QT_QTGUI_MODULE_H
 #define QT_QTGUI_MODULE_H
 #include <QtCore/QtCore>
-#include "qbitmap.h"
-#include "qicon.h"
-#include "qiconengine.h"
-#include "qiconengineplugin.h"
-#include "qimage.h"
-#include "qimageiohandler.h"
-#include "qimagereader.h"
-#include "qimagewriter.h"
-#include "qmovie.h"
-#include "qpicture.h"
-#include "qpictureformatplugin.h"
-#include "qpixmap.h"
-#include "qpixmapcache.h"
-#include "qs60mainapplication.h"
-#include "qs60mainappui.h"
-#include "qs60maindocument.h"
-#include "qvfbhdr.h"
-#include "qwsembedwidget.h"
+#include "qgraphicsanchorlayout.h"
+#include "qgraphicsgridlayout.h"
+#include "qgraphicsitem.h"
+#include "qgraphicsitemanimation.h"
+#include "qgraphicslayout.h"
+#include "qgraphicslayoutitem.h"
+#include "qgraphicslinearlayout.h"
+#include "qgraphicsproxywidget.h"
+#include "qgraphicsscene.h"
+#include "qgraphicssceneevent.h"
+#include "qgraphicstransform.h"
+#include "qgraphicsview.h"
+#include "qgraphicswidget.h"
+#include "qkeyeventtransition.h"
+#include "qmouseeventtransition.h"
+#include "qabstracttextdocumentlayout.h"
+#include "qfont.h"
+#include "qfontdatabase.h"
+#include "qfontinfo.h"
+#include "qfontmetrics.h"
+#include "qsyntaxhighlighter.h"
+#include "qtextcursor.h"
+#include "qtextdocument.h"
+#include "qtextdocumentfragment.h"
+#include "qtextdocumentwriter.h"
+#include "qtextformat.h"
+#include "qtextlayout.h"
+#include "qtextlist.h"
+#include "qtextobject.h"
+#include "qtextoption.h"
+#include "qtexttable.h"
 #include "qabstractbutton.h"
 #include "qabstractscrollarea.h"
 #include "qabstractslider.h"
@@ -69,65 +82,6 @@
 #include "qtoolbutton.h"
 #include "qvalidator.h"
 #include "qworkspace.h"
-#include "qinputcontext.h"
-#include "qinputcontextfactory.h"
-#include "qinputcontextplugin.h"
-#include "qgraphicsanchorlayout.h"
-#include "qgraphicsgridlayout.h"
-#include "qgraphicsitem.h"
-#include "qgraphicsitemanimation.h"
-#include "qgraphicslayout.h"
-#include "qgraphicslayoutitem.h"
-#include "qgraphicslinearlayout.h"
-#include "qgraphicsproxywidget.h"
-#include "qgraphicsscene.h"
-#include "qgraphicssceneevent.h"
-#include "qgraphicstransform.h"
-#include "qgraphicsview.h"
-#include "qgraphicswidget.h"
-#include "qgenericmatrix.h"
-#include "qmatrix4x4.h"
-#include "qquaternion.h"
-#include "qvector2d.h"
-#include "qvector3d.h"
-#include "qvector4d.h"
-#include "qabstracttextdocumentlayout.h"
-#include "qfont.h"
-#include "qfontdatabase.h"
-#include "qfontinfo.h"
-#include "qfontmetrics.h"
-#include "qsyntaxhighlighter.h"
-#include "qtextcursor.h"
-#include "qtextdocument.h"
-#include "qtextdocumentfragment.h"
-#include "qtextdocumentwriter.h"
-#include "qtextformat.h"
-#include "qtextlayout.h"
-#include "qtextlist.h"
-#include "qtextobject.h"
-#include "qtextoption.h"
-#include "qtexttable.h"
-#include "qabstractpagesetupdialog.h"
-#include "qabstractprintdialog.h"
-#include "qcolordialog.h"
-#include "qdialog.h"
-#include "qerrormessage.h"
-#include "qfiledialog.h"
-#include "qfilesystemmodel.h"
-#include "qfontdialog.h"
-#include "qinputdialog.h"
-#include "qmessagebox.h"
-#include "qpagesetupdialog.h"
-#include "qprintdialog.h"
-#include "qprintpreviewdialog.h"
-#include "qprogressdialog.h"
-#include "qwizard.h"
-#include "qaccessible.h"
-#include "qaccessible2.h"
-#include "qaccessiblebridge.h"
-#include "qaccessibleobject.h"
-#include "qaccessibleplugin.h"
-#include "qaccessiblewidget.h"
 #include "qaction.h"
 #include "qactiongroup.h"
 #include "qapplication.h"
@@ -156,29 +110,6 @@
 #include "qwidget.h"
 #include "qwidgetaction.h"
 #include "qwindowdefs.h"
-#include "qabstractitemdelegate.h"
-#include "qabstractitemview.h"
-#include "qabstractproxymodel.h"
-#include "qcolumnview.h"
-#include "qdatawidgetmapper.h"
-#include "qdirmodel.h"
-#include "qfileiconprovider.h"
-#include "qheaderview.h"
-#include "qitemdelegate.h"
-#include "qitemeditorfactory.h"
-#include "qitemselectionmodel.h"
-#include "qlistview.h"
-#include "qlistwidget.h"
-#include "qproxymodel.h"
-#include "qsortfilterproxymodel.h"
-#include "qstandarditemmodel.h"
-#include "qstringlistmodel.h"
-#include "qstyleditemdelegate.h"
-#include "qtableview.h"
-#include "qtablewidget.h"
-#include "qtreeview.h"
-#include "qtreewidget.h"
-#include "qtreewidgetitemiterator.h"
 #include "qbrush.h"
 #include "qcolor.h"
 #include "qcolormap.h"
@@ -216,9 +147,78 @@
 #include "qwindowsstyle.h"
 #include "qwindowsvistastyle.h"
 #include "qwindowsxpstyle.h"
-#include "qkeyeventtransition.h"
-#include "qmouseeventtransition.h"
+#include "qgenericmatrix.h"
+#include "qmatrix4x4.h"
+#include "qquaternion.h"
+#include "qvector2d.h"
+#include "qvector3d.h"
+#include "qvector4d.h"
+#include "qinputcontext.h"
+#include "qinputcontextfactory.h"
+#include "qinputcontextplugin.h"
 #include "qgraphicseffect.h"
+#include "qs60mainapplication.h"
+#include "qs60mainappui.h"
+#include "qs60maindocument.h"
+#include "qvfbhdr.h"
+#include "qwsembedwidget.h"
+#include "qbitmap.h"
+#include "qicon.h"
+#include "qiconengine.h"
+#include "qiconengineplugin.h"
+#include "qimage.h"
+#include "qimageiohandler.h"
+#include "qimagereader.h"
+#include "qimagewriter.h"
+#include "qmovie.h"
+#include "qpicture.h"
+#include "qpictureformatplugin.h"
+#include "qpixmap.h"
+#include "qpixmapcache.h"
+#include "qabstractpagesetupdialog.h"
+#include "qabstractprintdialog.h"
+#include "qcolordialog.h"
+#include "qdialog.h"
+#include "qerrormessage.h"
+#include "qfiledialog.h"
+#include "qfilesystemmodel.h"
+#include "qfontdialog.h"
+#include "qinputdialog.h"
+#include "qmessagebox.h"
+#include "qpagesetupdialog.h"
+#include "qprintdialog.h"
+#include "qprintpreviewdialog.h"
+#include "qprogressdialog.h"
+#include "qwizard.h"
+#include "qabstractitemdelegate.h"
+#include "qabstractitemview.h"
+#include "qabstractproxymodel.h"
+#include "qcolumnview.h"
+#include "qdatawidgetmapper.h"
+#include "qdirmodel.h"
+#include "qfileiconprovider.h"
+#include "qheaderview.h"
+#include "qitemdelegate.h"
+#include "qitemeditorfactory.h"
+#include "qitemselectionmodel.h"
+#include "qlistview.h"
+#include "qlistwidget.h"
+#include "qproxymodel.h"
+#include "qsortfilterproxymodel.h"
+#include "qstandarditemmodel.h"
+#include "qstringlistmodel.h"
+#include "qstyleditemdelegate.h"
+#include "qtableview.h"
+#include "qtablewidget.h"
+#include "qtreeview.h"
+#include "qtreewidget.h"
+#include "qtreewidgetitemiterator.h"
+#include "qaccessible.h"
+#include "qaccessible2.h"
+#include "qaccessiblebridge.h"
+#include "qaccessibleobject.h"
+#include "qaccessibleplugin.h"
+#include "qaccessiblewidget.h"
 #include "qcompleter.h"
 #include "qdesktopservices.h"
 #include "qsystemtrayicon.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtNetwork/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtNetwork/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/QtNetwork/headers.pri	2010-02-11 16:55:14.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtNetwork/headers.pri	2010-02-23 14:50:59.803613873 +0100
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../network/access/qabstractnetworkcache.h ../network/access/qftp.h ../network/access/qhttp.h ../network/access/qnetworkaccessmanager.h ../network/access/qnetworkcookie.h ../network/access/qnetworkcookiejar.h ../network/access/qnetworkdiskcache.h ../network/access/qnetworkreply.h ../network/access/qnetworkrequest.h ../network/kernel/qauthenticator.h ../network/kernel/qhostaddress.h ../network/kernel/qhostinfo.h ../network/kernel/qnetworkinterface.h ../network/kernel/qnetworkproxy.h ../network/kernel/qurlinfo.h ../network/socket/qabstractsocket.h ../network/socket/qlocalserver.h ../network/socket/qlocalsocket.h ../network/socket/qtcpserver.h ../network/socket/qtcpsocket.h ../network/socket/qudpsocket.h ../network/ssl/qssl.h ../network/ssl/qsslcertificate.h ../network/ssl/qsslcipher.h ../network/ssl/qsslconfiguration.h ../network/ssl/qsslerror.h ../network/ssl/qsslkey.h ../network/ssl/qsslsocket.h ../../include/QtNetwork/QtNetwork 
-SYNCQT.HEADER_CLASSES = ../../include/QtNetwork/QNetworkCacheMetaData ../../include/QtNetwork/QAbstractNetworkCache ../../include/QtNetwork/QFtp ../../include/QtNetwork/QHttpHeader ../../include/QtNetwork/QHttpResponseHeader ../../include/QtNetwork/QHttpRequestHeader ../../include/QtNetwork/QHttp ../../include/QtNetwork/QNetworkAccessManager ../../include/QtNetwork/QNetworkCookie ../../include/QtNetwork/QNetworkCookieJar ../../include/QtNetwork/QNetworkDiskCache ../../include/QtNetwork/QNetworkReply ../../include/QtNetwork/QNetworkRequest ../../include/QtNetwork/QAuthenticator ../../include/QtNetwork/QIPv6Address ../../include/QtNetwork/Q_IPV6ADDR ../../include/QtNetwork/QHostAddress ../../include/QtNetwork/QHostInfo ../../include/QtNetwork/QNetworkAddressEntry ../../include/QtNetwork/QNetworkInterface ../../include/QtNetwork/QNetworkProxyQuery ../../include/QtNetwork/QNetworkProxy ../../include/QtNetwork/QNetworkProxyFactory ../../include/QtNetwork/QUrlInfo ../../include/QtNetwork/QAbstractSocket ../../include/QtNetwork/QLocalServer ../../include/QtNetwork/QLocalSocket ../../include/QtNetwork/QTcpServer ../../include/QtNetwork/QTcpSocket ../../include/QtNetwork/QUdpSocket ../../include/QtNetwork/QSsl ../../include/QtNetwork/QSslCertificate ../../include/QtNetwork/QSslCipher ../../include/QtNetwork/QSslConfiguration ../../include/QtNetwork/QSslError ../../include/QtNetwork/QSslKey ../../include/QtNetwork/QSslSocket 
-SYNCQT.PRIVATE_HEADER_FILES = ../network/access/qabstractnetworkcache_p.h ../network/access/qfilenetworkreply_p.h ../network/access/qhttpnetworkconnection_p.h ../network/access/qhttpnetworkconnectionchannel_p.h ../network/access/qhttpnetworkheader_p.h ../network/access/qhttpnetworkreply_p.h ../network/access/qhttpnetworkrequest_p.h ../network/access/qnetworkaccessbackend_p.h ../network/access/qnetworkaccesscache_p.h ../network/access/qnetworkaccesscachebackend_p.h ../network/access/qnetworkaccessdatabackend_p.h ../network/access/qnetworkaccessdebugpipebackend_p.h ../network/access/qnetworkaccessfilebackend_p.h ../network/access/qnetworkaccessftpbackend_p.h ../network/access/qnetworkaccesshttpbackend_p.h ../network/access/qnetworkaccessmanager_p.h ../network/access/qnetworkcookie_p.h ../network/access/qnetworkcookiejar_p.h ../network/access/qnetworkdiskcache_p.h ../network/access/qnetworkreply_p.h ../network/access/qnetworkreplyimpl_p.h ../network/access/qnetworkrequest_p.h ../network/kernel/qauthenticator_p.h ../network/kernel/qhostaddress_p.h ../network/kernel/qhostinfo_p.h ../network/kernel/qnetworkinterface_p.h ../network/kernel/qnetworkinterface_win_p.h ../network/kernel/qnetworkproxy_p.h ../network/socket/qabstractsocket_p.h ../network/socket/qabstractsocketengine_p.h ../network/socket/qhttpsocketengine_p.h ../network/socket/qlocalserver_p.h ../network/socket/qlocalsocket_p.h ../network/socket/qnativesocketengine_p.h ../network/socket/qnet_unix_p.h ../network/socket/qsocks5socketengine_p.h ../network/socket/qtcpsocket_p.h ../network/ssl/qsslcertificate_p.h ../network/ssl/qsslcipher_p.h ../network/ssl/qsslconfiguration_p.h ../network/ssl/qsslkey_p.h ../network/ssl/qsslsocket_openssl_p.h ../network/ssl/qsslsocket_openssl_symbols_p.h ../network/ssl/qsslsocket_p.h 
+SYNCQT.HEADER_FILES = ../network/socket/qabstractsocket.h ../network/socket/qlocalserver.h ../network/socket/qlocalsocket.h ../network/socket/qtcpserver.h ../network/socket/qtcpsocket.h ../network/socket/qudpsocket.h ../network/kernel/qauthenticator.h ../network/kernel/qhostaddress.h ../network/kernel/qhostinfo.h ../network/kernel/qnetworkinterface.h ../network/kernel/qnetworkproxy.h ../network/kernel/qurlinfo.h ../network/access/qabstractnetworkcache.h ../network/access/qftp.h ../network/access/qhttp.h ../network/access/qnetworkaccessmanager.h ../network/access/qnetworkcookie.h ../network/access/qnetworkcookiejar.h ../network/access/qnetworkdiskcache.h ../network/access/qnetworkreply.h ../network/access/qnetworkrequest.h ../network/ssl/qssl.h ../network/ssl/qsslcertificate.h ../network/ssl/qsslcipher.h ../network/ssl/qsslconfiguration.h ../network/ssl/qsslerror.h ../network/ssl/qsslkey.h ../network/ssl/qsslsocket.h ../../include/QtNetwork/QtNetwork 
+SYNCQT.HEADER_CLASSES = ../../include/QtNetwork/QAbstractSocket ../../include/QtNetwork/QLocalServer ../../include/QtNetwork/QLocalSocket ../../include/QtNetwork/QTcpServer ../../include/QtNetwork/QTcpSocket ../../include/QtNetwork/QUdpSocket ../../include/QtNetwork/QAuthenticator ../../include/QtNetwork/QIPv6Address ../../include/QtNetwork/Q_IPV6ADDR ../../include/QtNetwork/QHostAddress ../../include/QtNetwork/QHostInfo ../../include/QtNetwork/QNetworkAddressEntry ../../include/QtNetwork/QNetworkInterface ../../include/QtNetwork/QNetworkProxyQuery ../../include/QtNetwork/QNetworkProxy ../../include/QtNetwork/QNetworkProxyFactory ../../include/QtNetwork/QUrlInfo ../../include/QtNetwork/QNetworkCacheMetaData ../../include/QtNetwork/QAbstractNetworkCache ../../include/QtNetwork/QFtp ../../include/QtNetwork/QHttpHeader ../../include/QtNetwork/QHttpResponseHeader ../../include/QtNetwork/QHttpRequestHeader ../../include/QtNetwork/QHttp ../../include/QtNetwork/QNetworkAccessManager ../../include/QtNetwork/QNetworkCookie ../../include/QtNetwork/QNetworkCookieJar ../../include/QtNetwork/QNetworkDiskCache ../../include/QtNetwork/QNetworkReply ../../include/QtNetwork/QNetworkRequest ../../include/QtNetwork/QSsl ../../include/QtNetwork/QSslCertificate ../../include/QtNetwork/QSslCipher ../../include/QtNetwork/QSslConfiguration ../../include/QtNetwork/QSslError ../../include/QtNetwork/QSslKey ../../include/QtNetwork/QSslSocket 
+SYNCQT.PRIVATE_HEADER_FILES = ../network/socket/qabstractsocket_p.h ../network/socket/qabstractsocketengine_p.h ../network/socket/qhttpsocketengine_p.h ../network/socket/qlocalserver_p.h ../network/socket/qlocalsocket_p.h ../network/socket/qnativesocketengine_p.h ../network/socket/qnet_unix_p.h ../network/socket/qsocks5socketengine_p.h ../network/socket/qtcpsocket_p.h ../network/kernel/qauthenticator_p.h ../network/kernel/qhostaddress_p.h ../network/kernel/qhostinfo_p.h ../network/kernel/qnetworkinterface_p.h ../network/kernel/qnetworkinterface_win_p.h ../network/kernel/qnetworkproxy_p.h ../network/access/qabstractnetworkcache_p.h ../network/access/qfilenetworkreply_p.h ../network/access/qhttpnetworkconnection_p.h ../network/access/qhttpnetworkconnectionchannel_p.h ../network/access/qhttpnetworkheader_p.h ../network/access/qhttpnetworkreply_p.h ../network/access/qhttpnetworkrequest_p.h ../network/access/qnetworkaccessbackend_p.h ../network/access/qnetworkaccesscache_p.h ../network/access/qnetworkaccesscachebackend_p.h ../network/access/qnetworkaccessdatabackend_p.h ../network/access/qnetworkaccessdebugpipebackend_p.h ../network/access/qnetworkaccessfilebackend_p.h ../network/access/qnetworkaccessftpbackend_p.h ../network/access/qnetworkaccesshttpbackend_p.h ../network/access/qnetworkaccessmanager_p.h ../network/access/qnetworkcookie_p.h ../network/access/qnetworkcookiejar_p.h ../network/access/qnetworkdiskcache_p.h ../network/access/qnetworkreply_p.h ../network/access/qnetworkreplyimpl_p.h ../network/access/qnetworkrequest_p.h ../network/ssl/qsslcertificate_p.h ../network/ssl/qsslcipher_p.h ../network/ssl/qsslconfiguration_p.h ../network/ssl/qsslkey_p.h ../network/ssl/qsslsocket_openssl_p.h ../network/ssl/qsslsocket_openssl_symbols_p.h ../network/ssl/qsslsocket_p.h 
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtNetwork/QtNetwork qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtNetwork/QtNetwork
--- qt-everywhere-opensource-src-4.6.2/include/QtNetwork/QtNetwork	2010-02-11 16:55:14.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtNetwork/QtNetwork	2010-02-23 14:50:59.803613873 +0100
@@ -1,6 +1,18 @@
 #ifndef QT_QTNETWORK_MODULE_H
 #define QT_QTNETWORK_MODULE_H
 #include <QtCore/QtCore>
+#include "qabstractsocket.h"
+#include "qlocalserver.h"
+#include "qlocalsocket.h"
+#include "qtcpserver.h"
+#include "qtcpsocket.h"
+#include "qudpsocket.h"
+#include "qauthenticator.h"
+#include "qhostaddress.h"
+#include "qhostinfo.h"
+#include "qnetworkinterface.h"
+#include "qnetworkproxy.h"
+#include "qurlinfo.h"
 #include "qabstractnetworkcache.h"
 #include "qftp.h"
 #include "qhttp.h"
@@ -10,18 +22,6 @@
 #include "qnetworkdiskcache.h"
 #include "qnetworkreply.h"
 #include "qnetworkrequest.h"
-#include "qauthenticator.h"
-#include "qhostaddress.h"
-#include "qhostinfo.h"
-#include "qnetworkinterface.h"
-#include "qnetworkproxy.h"
-#include "qurlinfo.h"
-#include "qabstractsocket.h"
-#include "qlocalserver.h"
-#include "qlocalsocket.h"
-#include "qtcpserver.h"
-#include "qtcpsocket.h"
-#include "qudpsocket.h"
 #include "qssl.h"
 #include "qsslcertificate.h"
 #include "qsslcipher.h"
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtScript/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtScript/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/QtScript/headers.pri	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtScript/headers.pri	2010-02-23 14:51:00.259613749 +0100
@@ -1,3 +1,3 @@
 SYNCQT.HEADER_FILES = ../script/api/qscriptable.h ../script/api/qscriptclass.h ../script/api/qscriptclasspropertyiterator.h ../script/api/qscriptcontext.h ../script/api/qscriptcontextinfo.h ../script/api/qscriptengine.h ../script/api/qscriptengineagent.h ../script/api/qscriptextensioninterface.h ../script/api/qscriptextensionplugin.h ../script/api/qscriptprogram.h ../script/api/qscriptstring.h ../script/api/qscriptvalue.h ../script/api/qscriptvalueiterator.h ../../include/QtScript/QtScript 
 SYNCQT.HEADER_CLASSES = ../../include/QtScript/QScriptable ../../include/QtScript/QScriptClass ../../include/QtScript/QScriptClassPropertyIterator ../../include/QtScript/QScriptContext ../../include/QtScript/QScriptContextInfo ../../include/QtScript/QScriptContextInfoList ../../include/QtScript/QScriptSyntaxCheckResult ../../include/QtScript/QScriptEngine ../../include/QtScript/QScriptEngineAgent ../../include/QtScript/QScriptExtensionInterface ../../include/QtScript/QScriptExtensionPlugin ../../include/QtScript/QScriptProgram ../../include/QtScript/QScriptString ../../include/QtScript/QScriptValueList ../../include/QtScript/QScriptValue ../../include/QtScript/QScriptValueIterator 
-SYNCQT.PRIVATE_HEADER_FILES = ../script/api/qscriptable_p.h ../script/api/qscriptcontext_p.h ../script/api/qscriptengine_p.h ../script/api/qscriptengineagent_p.h ../script/api/qscriptprogram_p.h ../script/api/qscriptstring_p.h ../script/api/qscriptvalue_p.h ../script/bridge/qscriptactivationobject_p.h ../script/bridge/qscriptclassobject_p.h ../script/bridge/qscriptdeclarativeclass_p.h ../script/bridge/qscriptdeclarativeobject_p.h ../script/bridge/qscriptfunction_p.h ../script/bridge/qscriptglobalobject_p.h ../script/bridge/qscriptobject_p.h ../script/bridge/qscriptqobject_p.h ../script/bridge/qscriptvariant_p.h ../script/parser/qscriptast_p.h ../script/parser/qscriptastfwd_p.h ../script/parser/qscriptastvisitor_p.h ../script/parser/qscriptgrammar_p.h ../script/parser/qscriptlexer_p.h ../script/parser/qscriptparser_p.h ../script/parser/qscriptsyntaxchecker_p.h ../script/utils/qscriptdate_p.h 
+SYNCQT.PRIVATE_HEADER_FILES = ../script/api/qscriptable_p.h ../script/api/qscriptcontext_p.h ../script/api/qscriptengine_p.h ../script/api/qscriptengineagent_p.h ../script/api/qscriptprogram_p.h ../script/api/qscriptstring_p.h ../script/api/qscriptvalue_p.h ../script/parser/qscriptast_p.h ../script/parser/qscriptastfwd_p.h ../script/parser/qscriptastvisitor_p.h ../script/parser/qscriptgrammar_p.h ../script/parser/qscriptlexer_p.h ../script/parser/qscriptparser_p.h ../script/parser/qscriptsyntaxchecker_p.h ../script/utils/qscriptdate_p.h ../script/bridge/qscriptactivationobject_p.h ../script/bridge/qscriptclassobject_p.h ../script/bridge/qscriptdeclarativeclass_p.h ../script/bridge/qscriptdeclarativeobject_p.h ../script/bridge/qscriptfunction_p.h ../script/bridge/qscriptglobalobject_p.h ../script/bridge/qscriptobject_p.h ../script/bridge/qscriptqobject_p.h ../script/bridge/qscriptvariant_p.h 
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtSql/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtSql/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/QtSql/headers.pri	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtSql/headers.pri	2010-02-23 14:51:00.335613994 +0100
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../sql/kernel/qsql.h ../sql/kernel/qsqldatabase.h ../sql/kernel/qsqldriver.h ../sql/kernel/qsqldriverplugin.h ../sql/kernel/qsqlerror.h ../sql/kernel/qsqlfield.h ../sql/kernel/qsqlindex.h ../sql/kernel/qsqlquery.h ../sql/kernel/qsqlrecord.h ../sql/kernel/qsqlresult.h ../sql/models/qsqlquerymodel.h ../sql/models/qsqlrelationaldelegate.h ../sql/models/qsqlrelationaltablemodel.h ../sql/models/qsqltablemodel.h ../sql/drivers/sqlite2/qsql_sqlite2.h ../sql/drivers/odbc/qsql_odbc.h ../sql/drivers/tds/qsql_tds.h ../sql/drivers/ibase/qsql_ibase.h ../sql/drivers/sqlite/qsql_sqlite.h ../sql/drivers/mysql/qsql_mysql.h ../sql/drivers/psql/qsql_psql.h ../sql/drivers/oci/qsql_oci.h ../sql/drivers/db2/qsql_db2.h ../../include/QtSql/QtSql 
-SYNCQT.HEADER_CLASSES = ../../include/QtSql/QSqlDriverCreatorBase ../../include/QtSql/QSqlDriverCreator ../../include/QtSql/QSqlDatabase ../../include/QtSql/QSqlDriver ../../include/QtSql/QSqlDriverFactoryInterface ../../include/QtSql/QSqlDriverPlugin ../../include/QtSql/QSqlError ../../include/QtSql/QSqlField ../../include/QtSql/QSqlIndex ../../include/QtSql/QSqlQuery ../../include/QtSql/QSqlRecord ../../include/QtSql/QSqlResult ../../include/QtSql/QSqlQueryModel ../../include/QtSql/QSqlRelationalDelegate ../../include/QtSql/QSqlRelation ../../include/QtSql/QSqlRelationalTableModel ../../include/QtSql/QSqlTableModel ../../include/QtSql/QSQLite2Result ../../include/QtSql/QSQLite2Driver ../../include/QtSql/QODBCResult ../../include/QtSql/QODBCDriver ../../include/QtSql/QTDSResult ../../include/QtSql/QTDSDriver ../../include/QtSql/QIBaseResult ../../include/QtSql/QIBaseDriver ../../include/QtSql/QSQLiteResult ../../include/QtSql/QSQLiteDriver ../../include/QtSql/QMYSQLResult ../../include/QtSql/QMYSQLDriver ../../include/QtSql/QPSQLResult ../../include/QtSql/QPSQLDriver ../../include/QtSql/QOCIResult ../../include/QtSql/QOCIDriver ../../include/QtSql/QDB2Result ../../include/QtSql/QDB2Driver 
+SYNCQT.HEADER_FILES = ../sql/kernel/qsql.h ../sql/kernel/qsqldatabase.h ../sql/kernel/qsqldriver.h ../sql/kernel/qsqldriverplugin.h ../sql/kernel/qsqlerror.h ../sql/kernel/qsqlfield.h ../sql/kernel/qsqlindex.h ../sql/kernel/qsqlquery.h ../sql/kernel/qsqlrecord.h ../sql/kernel/qsqlresult.h ../sql/models/qsqlquerymodel.h ../sql/models/qsqlrelationaldelegate.h ../sql/models/qsqlrelationaltablemodel.h ../sql/models/qsqltablemodel.h ../sql/drivers/odbc/qsql_odbc.h ../sql/drivers/db2/qsql_db2.h ../sql/drivers/psql/qsql_psql.h ../sql/drivers/sqlite/qsql_sqlite.h ../sql/drivers/oci/qsql_oci.h ../sql/drivers/ibase/qsql_ibase.h ../sql/drivers/mysql/qsql_mysql.h ../sql/drivers/tds/qsql_tds.h ../sql/drivers/sqlite2/qsql_sqlite2.h ../../include/QtSql/QtSql 
+SYNCQT.HEADER_CLASSES = ../../include/QtSql/QSqlDriverCreatorBase ../../include/QtSql/QSqlDriverCreator ../../include/QtSql/QSqlDatabase ../../include/QtSql/QSqlDriver ../../include/QtSql/QSqlDriverFactoryInterface ../../include/QtSql/QSqlDriverPlugin ../../include/QtSql/QSqlError ../../include/QtSql/QSqlField ../../include/QtSql/QSqlIndex ../../include/QtSql/QSqlQuery ../../include/QtSql/QSqlRecord ../../include/QtSql/QSqlResult ../../include/QtSql/QSqlQueryModel ../../include/QtSql/QSqlRelationalDelegate ../../include/QtSql/QSqlRelation ../../include/QtSql/QSqlRelationalTableModel ../../include/QtSql/QSqlTableModel ../../include/QtSql/QODBCResult ../../include/QtSql/QODBCDriver ../../include/QtSql/QDB2Result ../../include/QtSql/QDB2Driver ../../include/QtSql/QPSQLResult ../../include/QtSql/QPSQLDriver ../../include/QtSql/QSQLiteResult ../../include/QtSql/QSQLiteDriver ../../include/QtSql/QOCIResult ../../include/QtSql/QOCIDriver ../../include/QtSql/QIBaseResult ../../include/QtSql/QIBaseDriver ../../include/QtSql/QMYSQLResult ../../include/QtSql/QMYSQLDriver ../../include/QtSql/QTDSResult ../../include/QtSql/QTDSDriver ../../include/QtSql/QSQLite2Result ../../include/QtSql/QSQLite2Driver 
 SYNCQT.PRIVATE_HEADER_FILES = ../sql/kernel/qsqlcachedresult_p.h ../sql/kernel/qsqlnulldriver_p.h ../sql/models/qsqlquerymodel_p.h ../sql/models/qsqltablemodel_p.h 
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtXml/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtXml/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/QtXml/headers.pri	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtXml/headers.pri	2010-02-23 14:50:59.703613622 +0100
@@ -1,3 +1,3 @@
-SYNCQT.HEADER_FILES = ../xml/sax/qxml.h ../xml/dom/qdom.h ../xml/stream/qxmlstream.h ../../include/QtXml/QtXml 
-SYNCQT.HEADER_CLASSES = ../../include/QtXml/QXmlNamespaceSupport ../../include/QtXml/QXmlAttributes ../../include/QtXml/QXmlInputSource ../../include/QtXml/QXmlParseException ../../include/QtXml/QXmlReader ../../include/QtXml/QXmlSimpleReader ../../include/QtXml/QXmlLocator ../../include/QtXml/QXmlContentHandler ../../include/QtXml/QXmlErrorHandler ../../include/QtXml/QXmlDTDHandler ../../include/QtXml/QXmlEntityResolver ../../include/QtXml/QXmlLexicalHandler ../../include/QtXml/QXmlDeclHandler ../../include/QtXml/QXmlDefaultHandler ../../include/QtXml/QDomImplementation ../../include/QtXml/QDomNode ../../include/QtXml/QDomNodeList ../../include/QtXml/QDomDocumentType ../../include/QtXml/QDomDocument ../../include/QtXml/QDomNamedNodeMap ../../include/QtXml/QDomDocumentFragment ../../include/QtXml/QDomCharacterData ../../include/QtXml/QDomAttr ../../include/QtXml/QDomElement ../../include/QtXml/QDomText ../../include/QtXml/QDomComment ../../include/QtXml/QDomCDATASection ../../include/QtXml/QDomNotation ../../include/QtXml/QDomEntity ../../include/QtXml/QDomEntityReference ../../include/QtXml/QDomProcessingInstruction ../../include/QtXml/QXmlStreamAttribute ../../include/QtXml/QXmlStreamAttributes ../../include/QtXml/QXmlStreamEntityDeclaration ../../include/QtXml/QXmlStreamEntityDeclarations ../../include/QtXml/QXmlStreamEntityResolver ../../include/QtXml/QXmlStreamNamespaceDeclaration ../../include/QtXml/QXmlStreamNamespaceDeclarations ../../include/QtXml/QXmlStreamNotationDeclaration ../../include/QtXml/QXmlStreamNotationDeclarations ../../include/QtXml/QXmlStreamReader ../../include/QtXml/QXmlStreamStringRef ../../include/QtXml/QXmlStreamWriter 
+SYNCQT.HEADER_FILES = ../xml/stream/qxmlstream.h ../xml/dom/qdom.h ../xml/sax/qxml.h ../../include/QtXml/QtXml 
+SYNCQT.HEADER_CLASSES = ../../include/QtXml/QXmlStreamAttribute ../../include/QtXml/QXmlStreamAttributes ../../include/QtXml/QXmlStreamEntityDeclaration ../../include/QtXml/QXmlStreamEntityDeclarations ../../include/QtXml/QXmlStreamEntityResolver ../../include/QtXml/QXmlStreamNamespaceDeclaration ../../include/QtXml/QXmlStreamNamespaceDeclarations ../../include/QtXml/QXmlStreamNotationDeclaration ../../include/QtXml/QXmlStreamNotationDeclarations ../../include/QtXml/QXmlStreamReader ../../include/QtXml/QXmlStreamStringRef ../../include/QtXml/QXmlStreamWriter ../../include/QtXml/QDomImplementation ../../include/QtXml/QDomNode ../../include/QtXml/QDomNodeList ../../include/QtXml/QDomDocumentType ../../include/QtXml/QDomDocument ../../include/QtXml/QDomNamedNodeMap ../../include/QtXml/QDomDocumentFragment ../../include/QtXml/QDomCharacterData ../../include/QtXml/QDomAttr ../../include/QtXml/QDomElement ../../include/QtXml/QDomText ../../include/QtXml/QDomComment ../../include/QtXml/QDomCDATASection ../../include/QtXml/QDomNotation ../../include/QtXml/QDomEntity ../../include/QtXml/QDomEntityReference ../../include/QtXml/QDomProcessingInstruction ../../include/QtXml/QXmlNamespaceSupport ../../include/QtXml/QXmlAttributes ../../include/QtXml/QXmlInputSource ../../include/QtXml/QXmlParseException ../../include/QtXml/QXmlReader ../../include/QtXml/QXmlSimpleReader ../../include/QtXml/QXmlLocator ../../include/QtXml/QXmlContentHandler ../../include/QtXml/QXmlErrorHandler ../../include/QtXml/QXmlDTDHandler ../../include/QtXml/QXmlEntityResolver ../../include/QtXml/QXmlLexicalHandler ../../include/QtXml/QXmlDeclHandler ../../include/QtXml/QXmlDefaultHandler 
 SYNCQT.PRIVATE_HEADER_FILES = 
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtXml/QtXml qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtXml/QtXml
--- qt-everywhere-opensource-src-4.6.2/include/QtXml/QtXml	2010-02-11 16:55:15.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtXml/QtXml	2010-02-23 14:50:59.703613622 +0100
@@ -1,7 +1,7 @@
 #ifndef QT_QTXML_MODULE_H
 #define QT_QTXML_MODULE_H
 #include <QtCore/QtCore>
-#include "qxml.h"
-#include "qdom.h"
 #include "qxmlstream.h"
+#include "qdom.h"
+#include "qxml.h"
 #endif
diff -rupdN qt-everywhere-opensource-src-4.6.2/include/QtXmlPatterns/headers.pri qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtXmlPatterns/headers.pri
--- qt-everywhere-opensource-src-4.6.2/include/QtXmlPatterns/headers.pri	2010-02-11 16:55:14.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/include/QtXmlPatterns/headers.pri	2010-02-23 14:50:59.943613591 +0100
@@ -1,3 +1,3 @@
 SYNCQT.HEADER_FILES = ../xmlpatterns/api/qabstractmessagehandler.h ../xmlpatterns/api/qabstracturiresolver.h ../xmlpatterns/api/qabstractxmlnodemodel.h ../xmlpatterns/api/qabstractxmlreceiver.h ../xmlpatterns/api/qsimplexmlnodemodel.h ../xmlpatterns/api/qsourcelocation.h ../xmlpatterns/api/qxmlformatter.h ../xmlpatterns/api/qxmlname.h ../xmlpatterns/api/qxmlnamepool.h ../xmlpatterns/api/qxmlquery.h ../xmlpatterns/api/qxmlresultitems.h ../xmlpatterns/api/qxmlschema.h ../xmlpatterns/api/qxmlschemavalidator.h ../xmlpatterns/api/qxmlserializer.h ../../include/QtXmlPatterns/QtXmlPatterns 
 SYNCQT.HEADER_CLASSES = ../../include/QtXmlPatterns/QAbstractMessageHandler ../../include/QtXmlPatterns/QAbstractUriResolver ../../include/QtXmlPatterns/QXmlNodeModelIndex ../../include/QtXmlPatterns/QAbstractXmlNodeModel ../../include/QtXmlPatterns/QXmlItem ../../include/QtXmlPatterns/QAbstractXmlReceiver ../../include/QtXmlPatterns/QSimpleXmlNodeModel ../../include/QtXmlPatterns/QSourceLocation ../../include/QtXmlPatterns/QXmlFormatter ../../include/QtXmlPatterns/QXmlName ../../include/QtXmlPatterns/QXmlNamePool ../../include/QtXmlPatterns/QXmlQuery ../../include/QtXmlPatterns/QXmlResultItems ../../include/QtXmlPatterns/QXmlSchema ../../include/QtXmlPatterns/QXmlSchemaValidator ../../include/QtXmlPatterns/QXmlSerializer 
-SYNCQT.PRIVATE_HEADER_FILES = ../xmlpatterns/api/qabstractxmlforwarditerator_p.h ../xmlpatterns/api/qabstractxmlnodemodel_p.h ../xmlpatterns/api/qabstractxmlpullprovider_p.h ../xmlpatterns/api/qabstractxmlreceiver_p.h ../xmlpatterns/api/qcoloringmessagehandler_p.h ../xmlpatterns/api/qcoloroutput_p.h ../xmlpatterns/api/qdeviceresourceloader_p.h ../xmlpatterns/api/qiodevicedelegate_p.h ../xmlpatterns/api/qnetworkaccessdelegator_p.h ../xmlpatterns/api/qpullbridge_p.h ../xmlpatterns/api/qreferencecountedvalue_p.h ../xmlpatterns/api/qresourcedelegator_p.h ../xmlpatterns/api/quriloader_p.h ../xmlpatterns/api/qvariableloader_p.h ../xmlpatterns/api/qxmlpatternistcli_p.h ../xmlpatterns/api/qxmlquery_p.h ../xmlpatterns/api/qxmlresultitems_p.h ../xmlpatterns/api/qxmlschema_p.h ../xmlpatterns/api/qxmlschemavalidator_p.h ../xmlpatterns/api/qxmlserializer_p.h ../xmlpatterns/schema/qnamespacesupport_p.h ../xmlpatterns/schema/qxsdalternative_p.h ../xmlpatterns/schema/qxsdannotated_p.h ../xmlpatterns/schema/qxsdannotation_p.h ../xmlpatterns/schema/qxsdapplicationinformation_p.h ../xmlpatterns/schema/qxsdassertion_p.h ../xmlpatterns/schema/qxsdattribute_p.h ../xmlpatterns/schema/qxsdattributegroup_p.h ../xmlpatterns/schema/qxsdattributereference_p.h ../xmlpatterns/schema/qxsdattributeterm_p.h ../xmlpatterns/schema/qxsdattributeuse_p.h ../xmlpatterns/schema/qxsdcomplextype_p.h ../xmlpatterns/schema/qxsddocumentation_p.h ../xmlpatterns/schema/qxsdelement_p.h ../xmlpatterns/schema/qxsdfacet_p.h ../xmlpatterns/schema/qxsdidcache_p.h ../xmlpatterns/schema/qxsdidchelper_p.h ../xmlpatterns/schema/qxsdidentityconstraint_p.h ../xmlpatterns/schema/qxsdinstancereader_p.h ../xmlpatterns/schema/qxsdmodelgroup_p.h ../xmlpatterns/schema/qxsdnotation_p.h ../xmlpatterns/schema/qxsdparticle_p.h ../xmlpatterns/schema/qxsdparticlechecker_p.h ../xmlpatterns/schema/qxsdreference_p.h ../xmlpatterns/schema/qxsdschema_p.h ../xmlpatterns/schema/qxsdschemachecker_p.h ../xmlpatterns/schema/qxsdschemacontext_p.h ../xmlpatterns/schema/qxsdschemadebugger_p.h ../xmlpatterns/schema/qxsdschemahelper_p.h ../xmlpatterns/schema/qxsdschemamerger_p.h ../xmlpatterns/schema/qxsdschemaparser_p.h ../xmlpatterns/schema/qxsdschemaparsercontext_p.h ../xmlpatterns/schema/qxsdschemaresolver_p.h ../xmlpatterns/schema/qxsdschematoken_p.h ../xmlpatterns/schema/qxsdschematypesfactory_p.h ../xmlpatterns/schema/qxsdsimpletype_p.h ../xmlpatterns/schema/qxsdstatemachine_p.h ../xmlpatterns/schema/qxsdstatemachinebuilder_p.h ../xmlpatterns/schema/qxsdterm_p.h ../xmlpatterns/schema/qxsdtypechecker_p.h ../xmlpatterns/schema/qxsduserschematype_p.h ../xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h ../xmlpatterns/schema/qxsdvalidatinginstancereader_p.h ../xmlpatterns/schema/qxsdwildcard_p.h ../xmlpatterns/schema/qxsdxpathexpression_p.h ../xmlpatterns/iterators/qcachingiterator_p.h ../xmlpatterns/iterators/qdeduplicateiterator_p.h ../xmlpatterns/iterators/qdistinctiterator_p.h ../xmlpatterns/iterators/qemptyiterator_p.h ../xmlpatterns/iterators/qexceptiterator_p.h ../xmlpatterns/iterators/qindexofiterator_p.h ../xmlpatterns/iterators/qinsertioniterator_p.h ../xmlpatterns/iterators/qintersectiterator_p.h ../xmlpatterns/iterators/qitemmappingiterator_p.h ../xmlpatterns/iterators/qrangeiterator_p.h ../xmlpatterns/iterators/qremovaliterator_p.h ../xmlpatterns/iterators/qsequencemappingiterator_p.h ../xmlpatterns/iterators/qsingletoniterator_p.h ../xmlpatterns/iterators/qsubsequenceiterator_p.h ../xmlpatterns/iterators/qtocodepointsiterator_p.h ../xmlpatterns/iterators/qunioniterator_p.h ../xmlpatterns/type/qabstractnodetest_p.h ../xmlpatterns/type/qanyitemtype_p.h ../xmlpatterns/type/qanynodetype_p.h ../xmlpatterns/type/qanysimpletype_p.h ../xmlpatterns/type/qanytype_p.h ../xmlpatterns/type/qatomiccasterlocator_p.h ../xmlpatterns/type/qatomiccasterlocators_p.h ../xmlpatterns/type/qatomiccomparatorlocator_p.h ../xmlpatterns/type/qatomiccomparatorlocators_p.h ../xmlpatterns/type/qatomicmathematicianlocator_p.h ../xmlpatterns/type/qatomicmathematicianlocators_p.h ../xmlpatterns/type/qatomictype_p.h ../xmlpatterns/type/qatomictypedispatch_p.h ../xmlpatterns/type/qbasictypesfactory_p.h ../xmlpatterns/type/qbuiltinatomictype_p.h ../xmlpatterns/type/qbuiltinatomictypes_p.h ../xmlpatterns/type/qbuiltinnodetype_p.h ../xmlpatterns/type/qbuiltintypes_p.h ../xmlpatterns/type/qcardinality_p.h ../xmlpatterns/type/qcommonsequencetypes_p.h ../xmlpatterns/type/qebvtype_p.h ../xmlpatterns/type/qemptysequencetype_p.h ../xmlpatterns/type/qgenericsequencetype_p.h ../xmlpatterns/type/qitemtype_p.h ../xmlpatterns/type/qlocalnametest_p.h ../xmlpatterns/type/qmultiitemtype_p.h ../xmlpatterns/type/qnamedschemacomponent_p.h ../xmlpatterns/type/qnamespacenametest_p.h ../xmlpatterns/type/qnonetype_p.h ../xmlpatterns/type/qnumerictype_p.h ../xmlpatterns/type/qprimitives_p.h ../xmlpatterns/type/qqnametest_p.h ../xmlpatterns/type/qschemacomponent_p.h ../xmlpatterns/type/qschematype_p.h ../xmlpatterns/type/qschematypefactory_p.h ../xmlpatterns/type/qsequencetype_p.h ../xmlpatterns/type/qtypechecker_p.h ../xmlpatterns/type/quntyped_p.h ../xmlpatterns/type/qxsltnodetest_p.h ../xmlpatterns/functions/qabstractfunctionfactory_p.h ../xmlpatterns/functions/qaccessorfns_p.h ../xmlpatterns/functions/qaggregatefns_p.h ../xmlpatterns/functions/qaggregator_p.h ../xmlpatterns/functions/qassemblestringfns_p.h ../xmlpatterns/functions/qbooleanfns_p.h ../xmlpatterns/functions/qcomparescaseaware_p.h ../xmlpatterns/functions/qcomparestringfns_p.h ../xmlpatterns/functions/qcomparingaggregator_p.h ../xmlpatterns/functions/qconstructorfunctionsfactory_p.h ../xmlpatterns/functions/qcontextfns_p.h ../xmlpatterns/functions/qcontextnodechecker_p.h ../xmlpatterns/functions/qcurrentfn_p.h ../xmlpatterns/functions/qdatetimefn_p.h ../xmlpatterns/functions/qdatetimefns_p.h ../xmlpatterns/functions/qdeepequalfn_p.h ../xmlpatterns/functions/qdocumentfn_p.h ../xmlpatterns/functions/qelementavailablefn_p.h ../xmlpatterns/functions/qerrorfn_p.h ../xmlpatterns/functions/qfunctionargument_p.h ../xmlpatterns/functions/qfunctionavailablefn_p.h ../xmlpatterns/functions/qfunctioncall_p.h ../xmlpatterns/functions/qfunctionfactory_p.h ../xmlpatterns/functions/qfunctionfactorycollection_p.h ../xmlpatterns/functions/qfunctionsignature_p.h ../xmlpatterns/functions/qgenerateidfn_p.h ../xmlpatterns/functions/qnodefns_p.h ../xmlpatterns/functions/qnumericfns_p.h ../xmlpatterns/functions/qpatternmatchingfns_p.h ../xmlpatterns/functions/qpatternplatform_p.h ../xmlpatterns/functions/qqnamefns_p.h ../xmlpatterns/functions/qresolveurifn_p.h ../xmlpatterns/functions/qsequencefns_p.h ../xmlpatterns/functions/qsequencegeneratingfns_p.h ../xmlpatterns/functions/qstaticbaseuricontainer_p.h ../xmlpatterns/functions/qstaticnamespacescontainer_p.h ../xmlpatterns/functions/qstringvaluefns_p.h ../xmlpatterns/functions/qsubstringfns_p.h ../xmlpatterns/functions/qsystempropertyfn_p.h ../xmlpatterns/functions/qtimezonefns_p.h ../xmlpatterns/functions/qtracefn_p.h ../xmlpatterns/functions/qtypeavailablefn_p.h ../xmlpatterns/functions/qunparsedentitypublicidfn_p.h ../xmlpatterns/functions/qunparsedentityurifn_p.h ../xmlpatterns/functions/qunparsedtextavailablefn_p.h ../xmlpatterns/functions/qunparsedtextfn_p.h ../xmlpatterns/functions/qxpath10corefunctions_p.h ../xmlpatterns/functions/qxpath20corefunctions_p.h ../xmlpatterns/functions/qxslt20corefunctions_p.h ../xmlpatterns/environment/qcurrentitemcontext_p.h ../xmlpatterns/environment/qdelegatingdynamiccontext_p.h ../xmlpatterns/environment/qdelegatingstaticcontext_p.h ../xmlpatterns/environment/qdynamiccontext_p.h ../xmlpatterns/environment/qfocus_p.h ../xmlpatterns/environment/qgenericdynamiccontext_p.h ../xmlpatterns/environment/qgenericstaticcontext_p.h ../xmlpatterns/environment/qreceiverdynamiccontext_p.h ../xmlpatterns/environment/qreportcontext_p.h ../xmlpatterns/environment/qstackcontextbase_p.h ../xmlpatterns/environment/qstaticbaseuricontext_p.h ../xmlpatterns/environment/qstaticcompatibilitycontext_p.h ../xmlpatterns/environment/qstaticcontext_p.h ../xmlpatterns/environment/qstaticcurrentcontext_p.h ../xmlpatterns/environment/qstaticfocuscontext_p.h ../xmlpatterns/environment/qstaticnamespacecontext_p.h ../xmlpatterns/acceltree/qacceliterators_p.h ../xmlpatterns/acceltree/qacceltree_p.h ../xmlpatterns/acceltree/qacceltreebuilder_p.h ../xmlpatterns/acceltree/qacceltreeresourceloader_p.h ../xmlpatterns/acceltree/qcompressedwhitespace_p.h ../xmlpatterns/data/qabstractdatetime_p.h ../xmlpatterns/data/qabstractduration_p.h ../xmlpatterns/data/qabstractfloat_p.h ../xmlpatterns/data/qabstractfloatcasters_p.h ../xmlpatterns/data/qabstractfloatmathematician_p.h ../xmlpatterns/data/qanyuri_p.h ../xmlpatterns/data/qatomiccaster_p.h ../xmlpatterns/data/qatomiccasters_p.h ../xmlpatterns/data/qatomiccomparator_p.h ../xmlpatterns/data/qatomiccomparators_p.h ../xmlpatterns/data/qatomicmathematician_p.h ../xmlpatterns/data/qatomicmathematicians_p.h ../xmlpatterns/data/qatomicstring_p.h ../xmlpatterns/data/qbase64binary_p.h ../xmlpatterns/data/qboolean_p.h ../xmlpatterns/data/qcommonvalues_p.h ../xmlpatterns/data/qcomparisonfactory_p.h ../xmlpatterns/data/qdate_p.h ../xmlpatterns/data/qdaytimeduration_p.h ../xmlpatterns/data/qdecimal_p.h ../xmlpatterns/data/qderivedinteger_p.h ../xmlpatterns/data/qderivedstring_p.h ../xmlpatterns/data/qduration_p.h ../xmlpatterns/data/qgday_p.h ../xmlpatterns/data/qgmonth_p.h ../xmlpatterns/data/qgmonthday_p.h ../xmlpatterns/data/qgyear_p.h ../xmlpatterns/data/qgyearmonth_p.h ../xmlpatterns/data/qhexbinary_p.h ../xmlpatterns/data/qinteger_p.h ../xmlpatterns/data/qitem_p.h ../xmlpatterns/data/qnodebuilder_p.h ../xmlpatterns/data/qqnamevalue_p.h ../xmlpatterns/data/qresourceloader_p.h ../xmlpatterns/data/qschemadatetime_p.h ../xmlpatterns/data/qschemanumeric_p.h ../xmlpatterns/data/qschematime_p.h ../xmlpatterns/data/qsequencereceiver_p.h ../xmlpatterns/data/qsorttuple_p.h ../xmlpatterns/data/quntypedatomic_p.h ../xmlpatterns/data/qvalidationerror_p.h ../xmlpatterns/data/qvaluefactory_p.h ../xmlpatterns/data/qyearmonthduration_p.h ../xmlpatterns/parser/qmaintainingreader_p.h ../xmlpatterns/parser/qparsercontext_p.h ../xmlpatterns/parser/qquerytransformparser_p.h ../xmlpatterns/parser/qtokenizer_p.h ../xmlpatterns/parser/qtokenrevealer_p.h ../xmlpatterns/parser/qtokensource_p.h ../xmlpatterns/parser/qxquerytokenizer_p.h ../xmlpatterns/parser/qxslttokenizer_p.h ../xmlpatterns/parser/qxslttokenlookup_p.h ../xmlpatterns/janitors/qargumentconverter_p.h ../xmlpatterns/janitors/qatomizer_p.h ../xmlpatterns/janitors/qcardinalityverifier_p.h ../xmlpatterns/janitors/qebvextractor_p.h ../xmlpatterns/janitors/qitemverifier_p.h ../xmlpatterns/janitors/quntypedatomicconverter_p.h ../xmlpatterns/expr/qandexpression_p.h ../xmlpatterns/expr/qapplytemplate_p.h ../xmlpatterns/expr/qargumentreference_p.h ../xmlpatterns/expr/qarithmeticexpression_p.h ../xmlpatterns/expr/qattributeconstructor_p.h ../xmlpatterns/expr/qattributenamevalidator_p.h ../xmlpatterns/expr/qaxisstep_p.h ../xmlpatterns/expr/qcachecells_p.h ../xmlpatterns/expr/qcallsite_p.h ../xmlpatterns/expr/qcalltargetdescription_p.h ../xmlpatterns/expr/qcalltemplate_p.h ../xmlpatterns/expr/qcastableas_p.h ../xmlpatterns/expr/qcastas_p.h ../xmlpatterns/expr/qcastingplatform_p.h ../xmlpatterns/expr/qcollationchecker_p.h ../xmlpatterns/expr/qcombinenodes_p.h ../xmlpatterns/expr/qcommentconstructor_p.h ../xmlpatterns/expr/qcomparisonplatform_p.h ../xmlpatterns/expr/qcomputednamespaceconstructor_p.h ../xmlpatterns/expr/qcontextitem_p.h ../xmlpatterns/expr/qcopyof_p.h ../xmlpatterns/expr/qcurrentitemstore_p.h ../xmlpatterns/expr/qdocumentconstructor_p.h ../xmlpatterns/expr/qdocumentcontentvalidator_p.h ../xmlpatterns/expr/qdynamiccontextstore_p.h ../xmlpatterns/expr/qelementconstructor_p.h ../xmlpatterns/expr/qemptycontainer_p.h ../xmlpatterns/expr/qemptysequence_p.h ../xmlpatterns/expr/qevaluationcache_p.h ../xmlpatterns/expr/qexpression_p.h ../xmlpatterns/expr/qexpressiondispatch_p.h ../xmlpatterns/expr/qexpressionfactory_p.h ../xmlpatterns/expr/qexpressionsequence_p.h ../xmlpatterns/expr/qexpressionvariablereference_p.h ../xmlpatterns/expr/qexternalvariableloader_p.h ../xmlpatterns/expr/qexternalvariablereference_p.h ../xmlpatterns/expr/qfirstitempredicate_p.h ../xmlpatterns/expr/qforclause_p.h ../xmlpatterns/expr/qgeneralcomparison_p.h ../xmlpatterns/expr/qgenericpredicate_p.h ../xmlpatterns/expr/qifthenclause_p.h ../xmlpatterns/expr/qinstanceof_p.h ../xmlpatterns/expr/qletclause_p.h ../xmlpatterns/expr/qliteral_p.h ../xmlpatterns/expr/qliteralsequence_p.h ../xmlpatterns/expr/qnamespaceconstructor_p.h ../xmlpatterns/expr/qncnameconstructor_p.h ../xmlpatterns/expr/qnodecomparison_p.h ../xmlpatterns/expr/qnodesort_p.h ../xmlpatterns/expr/qoperandsiterator_p.h ../xmlpatterns/expr/qoptimizationpasses_p.h ../xmlpatterns/expr/qoptimizerblocks_p.h ../xmlpatterns/expr/qoptimizerframework_p.h ../xmlpatterns/expr/qorderby_p.h ../xmlpatterns/expr/qorexpression_p.h ../xmlpatterns/expr/qpaircontainer_p.h ../xmlpatterns/expr/qparentnodeaxis_p.h ../xmlpatterns/expr/qpath_p.h ../xmlpatterns/expr/qpositionalvariablereference_p.h ../xmlpatterns/expr/qprocessinginstructionconstructor_p.h ../xmlpatterns/expr/qqnameconstructor_p.h ../xmlpatterns/expr/qquantifiedexpression_p.h ../xmlpatterns/expr/qrangeexpression_p.h ../xmlpatterns/expr/qrangevariablereference_p.h ../xmlpatterns/expr/qreturnorderby_p.h ../xmlpatterns/expr/qsimplecontentconstructor_p.h ../xmlpatterns/expr/qsinglecontainer_p.h ../xmlpatterns/expr/qsourcelocationreflection_p.h ../xmlpatterns/expr/qstaticbaseuristore_p.h ../xmlpatterns/expr/qstaticcompatibilitystore_p.h ../xmlpatterns/expr/qtemplate_p.h ../xmlpatterns/expr/qtemplateinvoker_p.h ../xmlpatterns/expr/qtemplatemode_p.h ../xmlpatterns/expr/qtemplateparameterreference_p.h ../xmlpatterns/expr/qtemplatepattern_p.h ../xmlpatterns/expr/qtextnodeconstructor_p.h ../xmlpatterns/expr/qtreatas_p.h ../xmlpatterns/expr/qtriplecontainer_p.h ../xmlpatterns/expr/qtruthpredicate_p.h ../xmlpatterns/expr/qunaryexpression_p.h ../xmlpatterns/expr/qunlimitedcontainer_p.h ../xmlpatterns/expr/qunresolvedvariablereference_p.h ../xmlpatterns/expr/quserfunction_p.h ../xmlpatterns/expr/quserfunctioncallsite_p.h ../xmlpatterns/expr/qvalidate_p.h ../xmlpatterns/expr/qvaluecomparison_p.h ../xmlpatterns/expr/qvariabledeclaration_p.h ../xmlpatterns/expr/qvariablereference_p.h ../xmlpatterns/expr/qwithparam_p.h ../xmlpatterns/expr/qxsltsimplecontentconstructor_p.h ../xmlpatterns/projection/qdocumentprojector_p.h ../xmlpatterns/projection/qprojectedexpression_p.h ../xmlpatterns/utils/qautoptr_p.h ../xmlpatterns/utils/qcommonnamespaces_p.h ../xmlpatterns/utils/qcppcastinghelper_p.h ../xmlpatterns/utils/qdebug_p.h ../xmlpatterns/utils/qdelegatingnamespaceresolver_p.h ../xmlpatterns/utils/qgenericnamespaceresolver_p.h ../xmlpatterns/utils/qnamepool_p.h ../xmlpatterns/utils/qnamespacebinding_p.h ../xmlpatterns/utils/qnamespaceresolver_p.h ../xmlpatterns/utils/qnodenamespaceresolver_p.h ../xmlpatterns/utils/qoutputvalidator_p.h ../xmlpatterns/utils/qpatternistlocale_p.h ../xmlpatterns/utils/qxpathhelper_p.h 
+SYNCQT.PRIVATE_HEADER_FILES = ../xmlpatterns/type/qabstractnodetest_p.h ../xmlpatterns/type/qanyitemtype_p.h ../xmlpatterns/type/qanynodetype_p.h ../xmlpatterns/type/qanysimpletype_p.h ../xmlpatterns/type/qanytype_p.h ../xmlpatterns/type/qatomiccasterlocator_p.h ../xmlpatterns/type/qatomiccasterlocators_p.h ../xmlpatterns/type/qatomiccomparatorlocator_p.h ../xmlpatterns/type/qatomiccomparatorlocators_p.h ../xmlpatterns/type/qatomicmathematicianlocator_p.h ../xmlpatterns/type/qatomicmathematicianlocators_p.h ../xmlpatterns/type/qatomictype_p.h ../xmlpatterns/type/qatomictypedispatch_p.h ../xmlpatterns/type/qbasictypesfactory_p.h ../xmlpatterns/type/qbuiltinatomictype_p.h ../xmlpatterns/type/qbuiltinatomictypes_p.h ../xmlpatterns/type/qbuiltinnodetype_p.h ../xmlpatterns/type/qbuiltintypes_p.h ../xmlpatterns/type/qcardinality_p.h ../xmlpatterns/type/qcommonsequencetypes_p.h ../xmlpatterns/type/qebvtype_p.h ../xmlpatterns/type/qemptysequencetype_p.h ../xmlpatterns/type/qgenericsequencetype_p.h ../xmlpatterns/type/qitemtype_p.h ../xmlpatterns/type/qlocalnametest_p.h ../xmlpatterns/type/qmultiitemtype_p.h ../xmlpatterns/type/qnamedschemacomponent_p.h ../xmlpatterns/type/qnamespacenametest_p.h ../xmlpatterns/type/qnonetype_p.h ../xmlpatterns/type/qnumerictype_p.h ../xmlpatterns/type/qprimitives_p.h ../xmlpatterns/type/qqnametest_p.h ../xmlpatterns/type/qschemacomponent_p.h ../xmlpatterns/type/qschematype_p.h ../xmlpatterns/type/qschematypefactory_p.h ../xmlpatterns/type/qsequencetype_p.h ../xmlpatterns/type/qtypechecker_p.h ../xmlpatterns/type/quntyped_p.h ../xmlpatterns/type/qxsltnodetest_p.h ../xmlpatterns/environment/qcurrentitemcontext_p.h ../xmlpatterns/environment/qdelegatingdynamiccontext_p.h ../xmlpatterns/environment/qdelegatingstaticcontext_p.h ../xmlpatterns/environment/qdynamiccontext_p.h ../xmlpatterns/environment/qfocus_p.h ../xmlpatterns/environment/qgenericdynamiccontext_p.h ../xmlpatterns/environment/qgenericstaticcontext_p.h ../xmlpatterns/environment/qreceiverdynamiccontext_p.h ../xmlpatterns/environment/qreportcontext_p.h ../xmlpatterns/environment/qstackcontextbase_p.h ../xmlpatterns/environment/qstaticbaseuricontext_p.h ../xmlpatterns/environment/qstaticcompatibilitycontext_p.h ../xmlpatterns/environment/qstaticcontext_p.h ../xmlpatterns/environment/qstaticcurrentcontext_p.h ../xmlpatterns/environment/qstaticfocuscontext_p.h ../xmlpatterns/environment/qstaticnamespacecontext_p.h ../xmlpatterns/iterators/qcachingiterator_p.h ../xmlpatterns/iterators/qdeduplicateiterator_p.h ../xmlpatterns/iterators/qdistinctiterator_p.h ../xmlpatterns/iterators/qemptyiterator_p.h ../xmlpatterns/iterators/qexceptiterator_p.h ../xmlpatterns/iterators/qindexofiterator_p.h ../xmlpatterns/iterators/qinsertioniterator_p.h ../xmlpatterns/iterators/qintersectiterator_p.h ../xmlpatterns/iterators/qitemmappingiterator_p.h ../xmlpatterns/iterators/qrangeiterator_p.h ../xmlpatterns/iterators/qremovaliterator_p.h ../xmlpatterns/iterators/qsequencemappingiterator_p.h ../xmlpatterns/iterators/qsingletoniterator_p.h ../xmlpatterns/iterators/qsubsequenceiterator_p.h ../xmlpatterns/iterators/qtocodepointsiterator_p.h ../xmlpatterns/iterators/qunioniterator_p.h ../xmlpatterns/acceltree/qacceliterators_p.h ../xmlpatterns/acceltree/qacceltree_p.h ../xmlpatterns/acceltree/qacceltreebuilder_p.h ../xmlpatterns/acceltree/qacceltreeresourceloader_p.h ../xmlpatterns/acceltree/qcompressedwhitespace_p.h ../xmlpatterns/data/qabstractdatetime_p.h ../xmlpatterns/data/qabstractduration_p.h ../xmlpatterns/data/qabstractfloat_p.h ../xmlpatterns/data/qabstractfloatcasters_p.h ../xmlpatterns/data/qabstractfloatmathematician_p.h ../xmlpatterns/data/qanyuri_p.h ../xmlpatterns/data/qatomiccaster_p.h ../xmlpatterns/data/qatomiccasters_p.h ../xmlpatterns/data/qatomiccomparator_p.h ../xmlpatterns/data/qatomiccomparators_p.h ../xmlpatterns/data/qatomicmathematician_p.h ../xmlpatterns/data/qatomicmathematicians_p.h ../xmlpatterns/data/qatomicstring_p.h ../xmlpatterns/data/qbase64binary_p.h ../xmlpatterns/data/qboolean_p.h ../xmlpatterns/data/qcommonvalues_p.h ../xmlpatterns/data/qcomparisonfactory_p.h ../xmlpatterns/data/qdate_p.h ../xmlpatterns/data/qdaytimeduration_p.h ../xmlpatterns/data/qdecimal_p.h ../xmlpatterns/data/qderivedinteger_p.h ../xmlpatterns/data/qderivedstring_p.h ../xmlpatterns/data/qduration_p.h ../xmlpatterns/data/qgday_p.h ../xmlpatterns/data/qgmonth_p.h ../xmlpatterns/data/qgmonthday_p.h ../xmlpatterns/data/qgyear_p.h ../xmlpatterns/data/qgyearmonth_p.h ../xmlpatterns/data/qhexbinary_p.h ../xmlpatterns/data/qinteger_p.h ../xmlpatterns/data/qitem_p.h ../xmlpatterns/data/qnodebuilder_p.h ../xmlpatterns/data/qqnamevalue_p.h ../xmlpatterns/data/qresourceloader_p.h ../xmlpatterns/data/qschemadatetime_p.h ../xmlpatterns/data/qschemanumeric_p.h ../xmlpatterns/data/qschematime_p.h ../xmlpatterns/data/qsequencereceiver_p.h ../xmlpatterns/data/qsorttuple_p.h ../xmlpatterns/data/quntypedatomic_p.h ../xmlpatterns/data/qvalidationerror_p.h ../xmlpatterns/data/qvaluefactory_p.h ../xmlpatterns/data/qyearmonthduration_p.h ../xmlpatterns/projection/qdocumentprojector_p.h ../xmlpatterns/projection/qprojectedexpression_p.h ../xmlpatterns/api/qabstractxmlforwarditerator_p.h ../xmlpatterns/api/qabstractxmlnodemodel_p.h ../xmlpatterns/api/qabstractxmlpullprovider_p.h ../xmlpatterns/api/qabstractxmlreceiver_p.h ../xmlpatterns/api/qcoloringmessagehandler_p.h ../xmlpatterns/api/qcoloroutput_p.h ../xmlpatterns/api/qdeviceresourceloader_p.h ../xmlpatterns/api/qiodevicedelegate_p.h ../xmlpatterns/api/qnetworkaccessdelegator_p.h ../xmlpatterns/api/qpullbridge_p.h ../xmlpatterns/api/qreferencecountedvalue_p.h ../xmlpatterns/api/qresourcedelegator_p.h ../xmlpatterns/api/quriloader_p.h ../xmlpatterns/api/qvariableloader_p.h ../xmlpatterns/api/qxmlpatternistcli_p.h ../xmlpatterns/api/qxmlquery_p.h ../xmlpatterns/api/qxmlresultitems_p.h ../xmlpatterns/api/qxmlschema_p.h ../xmlpatterns/api/qxmlschemavalidator_p.h ../xmlpatterns/api/qxmlserializer_p.h ../xmlpatterns/schema/qnamespacesupport_p.h ../xmlpatterns/schema/qxsdalternative_p.h ../xmlpatterns/schema/qxsdannotated_p.h ../xmlpatterns/schema/qxsdannotation_p.h ../xmlpatterns/schema/qxsdapplicationinformation_p.h ../xmlpatterns/schema/qxsdassertion_p.h ../xmlpatterns/schema/qxsdattribute_p.h ../xmlpatterns/schema/qxsdattributegroup_p.h ../xmlpatterns/schema/qxsdattributereference_p.h ../xmlpatterns/schema/qxsdattributeterm_p.h ../xmlpatterns/schema/qxsdattributeuse_p.h ../xmlpatterns/schema/qxsdcomplextype_p.h ../xmlpatterns/schema/qxsddocumentation_p.h ../xmlpatterns/schema/qxsdelement_p.h ../xmlpatterns/schema/qxsdfacet_p.h ../xmlpatterns/schema/qxsdidcache_p.h ../xmlpatterns/schema/qxsdidchelper_p.h ../xmlpatterns/schema/qxsdidentityconstraint_p.h ../xmlpatterns/schema/qxsdinstancereader_p.h ../xmlpatterns/schema/qxsdmodelgroup_p.h ../xmlpatterns/schema/qxsdnotation_p.h ../xmlpatterns/schema/qxsdparticle_p.h ../xmlpatterns/schema/qxsdparticlechecker_p.h ../xmlpatterns/schema/qxsdreference_p.h ../xmlpatterns/schema/qxsdschema_p.h ../xmlpatterns/schema/qxsdschemachecker_p.h ../xmlpatterns/schema/qxsdschemacontext_p.h ../xmlpatterns/schema/qxsdschemadebugger_p.h ../xmlpatterns/schema/qxsdschemahelper_p.h ../xmlpatterns/schema/qxsdschemamerger_p.h ../xmlpatterns/schema/qxsdschemaparser_p.h ../xmlpatterns/schema/qxsdschemaparsercontext_p.h ../xmlpatterns/schema/qxsdschemaresolver_p.h ../xmlpatterns/schema/qxsdschematoken_p.h ../xmlpatterns/schema/qxsdschematypesfactory_p.h ../xmlpatterns/schema/qxsdsimpletype_p.h ../xmlpatterns/schema/qxsdstatemachine_p.h ../xmlpatterns/schema/qxsdstatemachinebuilder_p.h ../xmlpatterns/schema/qxsdterm_p.h ../xmlpatterns/schema/qxsdtypechecker_p.h ../xmlpatterns/schema/qxsduserschematype_p.h ../xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h ../xmlpatterns/schema/qxsdvalidatinginstancereader_p.h ../xmlpatterns/schema/qxsdwildcard_p.h ../xmlpatterns/schema/qxsdxpathexpression_p.h ../xmlpatterns/janitors/qargumentconverter_p.h ../xmlpatterns/janitors/qatomizer_p.h ../xmlpatterns/janitors/qcardinalityverifier_p.h ../xmlpatterns/janitors/qebvextractor_p.h ../xmlpatterns/janitors/qitemverifier_p.h ../xmlpatterns/janitors/quntypedatomicconverter_p.h ../xmlpatterns/parser/qmaintainingreader_p.h ../xmlpatterns/parser/qparsercontext_p.h ../xmlpatterns/parser/qquerytransformparser_p.h ../xmlpatterns/parser/qtokenizer_p.h ../xmlpatterns/parser/qtokenrevealer_p.h ../xmlpatterns/parser/qtokensource_p.h ../xmlpatterns/parser/qxquerytokenizer_p.h ../xmlpatterns/parser/qxslttokenizer_p.h ../xmlpatterns/parser/qxslttokenlookup_p.h ../xmlpatterns/functions/qabstractfunctionfactory_p.h ../xmlpatterns/functions/qaccessorfns_p.h ../xmlpatterns/functions/qaggregatefns_p.h ../xmlpatterns/functions/qaggregator_p.h ../xmlpatterns/functions/qassemblestringfns_p.h ../xmlpatterns/functions/qbooleanfns_p.h ../xmlpatterns/functions/qcomparescaseaware_p.h ../xmlpatterns/functions/qcomparestringfns_p.h ../xmlpatterns/functions/qcomparingaggregator_p.h ../xmlpatterns/functions/qconstructorfunctionsfactory_p.h ../xmlpatterns/functions/qcontextfns_p.h ../xmlpatterns/functions/qcontextnodechecker_p.h ../xmlpatterns/functions/qcurrentfn_p.h ../xmlpatterns/functions/qdatetimefn_p.h ../xmlpatterns/functions/qdatetimefns_p.h ../xmlpatterns/functions/qdeepequalfn_p.h ../xmlpatterns/functions/qdocumentfn_p.h ../xmlpatterns/functions/qelementavailablefn_p.h ../xmlpatterns/functions/qerrorfn_p.h ../xmlpatterns/functions/qfunctionargument_p.h ../xmlpatterns/functions/qfunctionavailablefn_p.h ../xmlpatterns/functions/qfunctioncall_p.h ../xmlpatterns/functions/qfunctionfactory_p.h ../xmlpatterns/functions/qfunctionfactorycollection_p.h ../xmlpatterns/functions/qfunctionsignature_p.h ../xmlpatterns/functions/qgenerateidfn_p.h ../xmlpatterns/functions/qnodefns_p.h ../xmlpatterns/functions/qnumericfns_p.h ../xmlpatterns/functions/qpatternmatchingfns_p.h ../xmlpatterns/functions/qpatternplatform_p.h ../xmlpatterns/functions/qqnamefns_p.h ../xmlpatterns/functions/qresolveurifn_p.h ../xmlpatterns/functions/qsequencefns_p.h ../xmlpatterns/functions/qsequencegeneratingfns_p.h ../xmlpatterns/functions/qstaticbaseuricontainer_p.h ../xmlpatterns/functions/qstaticnamespacescontainer_p.h ../xmlpatterns/functions/qstringvaluefns_p.h ../xmlpatterns/functions/qsubstringfns_p.h ../xmlpatterns/functions/qsystempropertyfn_p.h ../xmlpatterns/functions/qtimezonefns_p.h ../xmlpatterns/functions/qtracefn_p.h ../xmlpatterns/functions/qtypeavailablefn_p.h ../xmlpatterns/functions/qunparsedentitypublicidfn_p.h ../xmlpatterns/functions/qunparsedentityurifn_p.h ../xmlpatterns/functions/qunparsedtextavailablefn_p.h ../xmlpatterns/functions/qunparsedtextfn_p.h ../xmlpatterns/functions/qxpath10corefunctions_p.h ../xmlpatterns/functions/qxpath20corefunctions_p.h ../xmlpatterns/functions/qxslt20corefunctions_p.h ../xmlpatterns/utils/qautoptr_p.h ../xmlpatterns/utils/qcommonnamespaces_p.h ../xmlpatterns/utils/qcppcastinghelper_p.h ../xmlpatterns/utils/qdebug_p.h ../xmlpatterns/utils/qdelegatingnamespaceresolver_p.h ../xmlpatterns/utils/qgenericnamespaceresolver_p.h ../xmlpatterns/utils/qnamepool_p.h ../xmlpatterns/utils/qnamespacebinding_p.h ../xmlpatterns/utils/qnamespaceresolver_p.h ../xmlpatterns/utils/qnodenamespaceresolver_p.h ../xmlpatterns/utils/qoutputvalidator_p.h ../xmlpatterns/utils/qpatternistlocale_p.h ../xmlpatterns/utils/qxpathhelper_p.h ../xmlpatterns/expr/qandexpression_p.h ../xmlpatterns/expr/qapplytemplate_p.h ../xmlpatterns/expr/qargumentreference_p.h ../xmlpatterns/expr/qarithmeticexpression_p.h ../xmlpatterns/expr/qattributeconstructor_p.h ../xmlpatterns/expr/qattributenamevalidator_p.h ../xmlpatterns/expr/qaxisstep_p.h ../xmlpatterns/expr/qcachecells_p.h ../xmlpatterns/expr/qcallsite_p.h ../xmlpatterns/expr/qcalltargetdescription_p.h ../xmlpatterns/expr/qcalltemplate_p.h ../xmlpatterns/expr/qcastableas_p.h ../xmlpatterns/expr/qcastas_p.h ../xmlpatterns/expr/qcastingplatform_p.h ../xmlpatterns/expr/qcollationchecker_p.h ../xmlpatterns/expr/qcombinenodes_p.h ../xmlpatterns/expr/qcommentconstructor_p.h ../xmlpatterns/expr/qcomparisonplatform_p.h ../xmlpatterns/expr/qcomputednamespaceconstructor_p.h ../xmlpatterns/expr/qcontextitem_p.h ../xmlpatterns/expr/qcopyof_p.h ../xmlpatterns/expr/qcurrentitemstore_p.h ../xmlpatterns/expr/qdocumentconstructor_p.h ../xmlpatterns/expr/qdocumentcontentvalidator_p.h ../xmlpatterns/expr/qdynamiccontextstore_p.h ../xmlpatterns/expr/qelementconstructor_p.h ../xmlpatterns/expr/qemptycontainer_p.h ../xmlpatterns/expr/qemptysequence_p.h ../xmlpatterns/expr/qevaluationcache_p.h ../xmlpatterns/expr/qexpression_p.h ../xmlpatterns/expr/qexpressiondispatch_p.h ../xmlpatterns/expr/qexpressionfactory_p.h ../xmlpatterns/expr/qexpressionsequence_p.h ../xmlpatterns/expr/qexpressionvariablereference_p.h ../xmlpatterns/expr/qexternalvariableloader_p.h ../xmlpatterns/expr/qexternalvariablereference_p.h ../xmlpatterns/expr/qfirstitempredicate_p.h ../xmlpatterns/expr/qforclause_p.h ../xmlpatterns/expr/qgeneralcomparison_p.h ../xmlpatterns/expr/qgenericpredicate_p.h ../xmlpatterns/expr/qifthenclause_p.h ../xmlpatterns/expr/qinstanceof_p.h ../xmlpatterns/expr/qletclause_p.h ../xmlpatterns/expr/qliteral_p.h ../xmlpatterns/expr/qliteralsequence_p.h ../xmlpatterns/expr/qnamespaceconstructor_p.h ../xmlpatterns/expr/qncnameconstructor_p.h ../xmlpatterns/expr/qnodecomparison_p.h ../xmlpatterns/expr/qnodesort_p.h ../xmlpatterns/expr/qoperandsiterator_p.h ../xmlpatterns/expr/qoptimizationpasses_p.h ../xmlpatterns/expr/qoptimizerblocks_p.h ../xmlpatterns/expr/qoptimizerframework_p.h ../xmlpatterns/expr/qorderby_p.h ../xmlpatterns/expr/qorexpression_p.h ../xmlpatterns/expr/qpaircontainer_p.h ../xmlpatterns/expr/qparentnodeaxis_p.h ../xmlpatterns/expr/qpath_p.h ../xmlpatterns/expr/qpositionalvariablereference_p.h ../xmlpatterns/expr/qprocessinginstructionconstructor_p.h ../xmlpatterns/expr/qqnameconstructor_p.h ../xmlpatterns/expr/qquantifiedexpression_p.h ../xmlpatterns/expr/qrangeexpression_p.h ../xmlpatterns/expr/qrangevariablereference_p.h ../xmlpatterns/expr/qreturnorderby_p.h ../xmlpatterns/expr/qsimplecontentconstructor_p.h ../xmlpatterns/expr/qsinglecontainer_p.h ../xmlpatterns/expr/qsourcelocationreflection_p.h ../xmlpatterns/expr/qstaticbaseuristore_p.h ../xmlpatterns/expr/qstaticcompatibilitystore_p.h ../xmlpatterns/expr/qtemplate_p.h ../xmlpatterns/expr/qtemplateinvoker_p.h ../xmlpatterns/expr/qtemplatemode_p.h ../xmlpatterns/expr/qtemplateparameterreference_p.h ../xmlpatterns/expr/qtemplatepattern_p.h ../xmlpatterns/expr/qtextnodeconstructor_p.h ../xmlpatterns/expr/qtreatas_p.h ../xmlpatterns/expr/qtriplecontainer_p.h ../xmlpatterns/expr/qtruthpredicate_p.h ../xmlpatterns/expr/qunaryexpression_p.h ../xmlpatterns/expr/qunlimitedcontainer_p.h ../xmlpatterns/expr/qunresolvedvariablereference_p.h ../xmlpatterns/expr/quserfunction_p.h ../xmlpatterns/expr/quserfunctioncallsite_p.h ../xmlpatterns/expr/qvalidate_p.h ../xmlpatterns/expr/qvaluecomparison_p.h ../xmlpatterns/expr/qvariabledeclaration_p.h ../xmlpatterns/expr/qvariablereference_p.h ../xmlpatterns/expr/qwithparam_p.h ../xmlpatterns/expr/qxsltsimplecontentconstructor_p.h 
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/abstractrenderer.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/abstractrenderer.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/abstractrenderer.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/abstractrenderer.cpp	2010-02-23 14:47:28.104613727 +0100
@@ -17,7 +17,6 @@
 
 #include "abstractrenderer.h"
 
-#ifndef QT_NO_PHONON_VIDEO
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
@@ -53,5 +52,5 @@ void AbstractRenderer::movieSizeChanged(
 } //namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_VIDEO
+
 
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/abstractrenderer.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/abstractrenderer.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/abstractrenderer.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/abstractrenderer.h	2010-02-23 14:47:28.104613727 +0100
@@ -23,7 +23,6 @@
 #include "medianode.h"
 #include <phonon/videowidget.h>
 
-#ifndef QT_NO_PHONON_VIDEO
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -59,5 +58,5 @@ protected:
 } //namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_VIDEO
+
 #endif // Phonon_GSTREAMER_ABSTRACTRENDERER_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/artssink.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/artssink.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/artssink.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/artssink.cpp	2010-02-23 14:47:28.104613727 +0100
@@ -233,7 +233,7 @@ static void arts_sink_init (ArtsSink * s
     Q_UNUSED(g_class);
     GST_DEBUG_OBJECT (src, "initializing artssink");
     src->stream = 0;
-#ifndef QT_NO_LIBRARY
+
     p_arts_init =  (Ptr_arts_init)QLibrary::resolve(QLatin1String("artsc"), 0, "arts_init");
     p_arts_play_stream =  (Ptr_arts_play_stream)QLibrary::resolve(QLatin1String("artsc"), 0, "arts_play_stream");
     p_arts_close_stream =  (Ptr_arts_close_stream)QLibrary::resolve(QLatin1String("artsc"), 0, "arts_close_stream");
@@ -250,7 +250,6 @@ static void arts_sink_init (ArtsSink * s
         }
     }
     sinkCount ++;
-#endif //QT_NO_LIBRARY
 }
 
 static void arts_sink_dispose (GObject * object)
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audiodataoutput.cpp	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1,143 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2006 Matthias Kretz <kretz@kde.org>
+    Copyright (C) 2009 Martin Sandsmark <sandsmark@samfundet.no>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "audiodataoutput.h"
+#include "gsthelper.h"
+#include "medianode.h"
+#include "mediaobject.h"
+#include <QtCore/QVector>
+#include <QtCore/QMap>
+#include <phonon/audiooutput.h>
+
+namespace Phonon
+{
+namespace Gstreamer
+{
+AudioDataOutput::AudioDataOutput(Backend *backend, QObject *parent)
+    : QObject(parent),
+    MediaNode(backend, AudioSink | AudioSource)
+{
+    static int count = 0;
+    m_name = "AudioDataOutput" + QString::number(count++);
+
+    m_queue = gst_element_factory_make ("identity", NULL);
+    gst_object_ref(m_queue);
+    m_isValid = true;
+}
+
+AudioDataOutput::~AudioDataOutput()
+{
+    gst_element_set_state(m_queue, GST_STATE_NULL);
+    gst_object_unref(m_queue);
+}
+
+int AudioDataOutput::dataSize() const
+{
+    return m_dataSize;
+}
+
+int AudioDataOutput::sampleRate() const
+{
+    return 44100;
+}
+
+void AudioDataOutput::setDataSize(int size)
+{
+    m_dataSize = size;
+}
+
+typedef QMap<Phonon::AudioDataOutput::Channel, QVector<float> > FloatMap;
+typedef QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > IntMap;
+
+inline void AudioDataOutput::convertAndEmit(const QVector<qint16> &leftBuffer, const QVector<qint16> &rightBuffer)
+{
+    //TODO: Floats
+    IntMap map;
+    map.insert(Phonon::AudioDataOutput::LeftChannel, leftBuffer);
+    map.insert(Phonon::AudioDataOutput::RightChannel, rightBuffer);
+    emit dataReady(map);
+}
+
+void AudioDataOutput::processBuffer(GstPad*, GstBuffer* buffer, gpointer gThat)
+{
+    // TODO emit endOfMedia
+    AudioDataOutput *that = reinterpret_cast<AudioDataOutput*>(gThat);
+
+    // determine the number of channels
+    GstStructure* structure = gst_caps_get_structure (GST_BUFFER_CAPS(buffer), 0);
+    gst_structure_get_int (structure, "channels", &that->m_channels);
+
+    if (that->m_channels > 2 || that->m_channels < 0) {
+        qWarning() << Q_FUNC_INFO << ": Number of channels not supported: " << that->m_channels;
+        return;
+    }
+
+    gint16 *data = reinterpret_cast<gint16*>(GST_BUFFER_DATA(buffer));
+    guint size = GST_BUFFER_SIZE(buffer) / sizeof(gint16);
+
+    that->m_pendingData.reserve(that->m_pendingData.size() + size);
+
+    for (uint i=0; i<size; i++) {
+        // 8 bit? interleaved? yay for lacking documentation!
+        that->m_pendingData.append(data[i]);
+    }
+
+    while (that->m_pendingData.size() > that->m_dataSize * that->m_channels) {
+        if (that->m_channels == 1) {
+            QVector<qint16> intBuffer(that->m_dataSize);
+            memcpy(intBuffer.data(), that->m_pendingData.constData(), that->m_dataSize * sizeof(qint16));
+
+            that->convertAndEmit(intBuffer, intBuffer);
+            int newSize = that->m_pendingData.size() - that->m_dataSize;
+            memmove(that->m_pendingData.data(), that->m_pendingData.constData() + that->m_dataSize, newSize * sizeof(qint16));
+            that->m_pendingData.resize(newSize);
+        } else {
+            QVector<qint16> left(that->m_dataSize), right(that->m_dataSize);
+            for (int i=0; i<that->m_dataSize; i++) {
+                left[i] = that->m_pendingData[i*2];
+                right[i] = that->m_pendingData[i*2+1];
+            }
+            that->m_pendingData.resize(that->m_pendingData.size() - that->m_dataSize*2);
+            that->convertAndEmit(left, right);
+        }
+    }
+}
+
+void AudioDataOutput::mediaNodeEvent(const MediaNodeEvent *event)
+{
+    if (event->type() == MediaNodeEvent::MediaObjectConnected && root()) {
+        g_object_set(G_OBJECT(audioElement()), "sync", true, (const char*)NULL);
+        GstPad *audiopad = gst_element_get_pad (audioElement(), "src");
+        gst_pad_add_buffer_probe (audiopad, G_CALLBACK(processBuffer), this);
+        gst_object_unref (audiopad);
+        return;
+    }
+
+    MediaNode::mediaNodeEvent(event);
+}
+
+}} //namespace Phonon::Gstreamer
+
+#include "moc_audiodataoutput.cpp"
+// vim: sw=4 ts=4
+
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audiodataoutput.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audiodataoutput.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audiodataoutput.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audiodataoutput.h	2010-02-23 14:47:28.104613727 +0100
@@ -0,0 +1,84 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2006 Matthias Kretz <kretz@kde.org>
+    Copyright (C) 2009 Martin Sandsmark <sandsmark@samfundet.no>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef Phonon_GSTREAMER_AUDIODATAOUTPUT_H
+#define Phonon_GSTREAMER_AUDIODATAOUTPUT_H
+
+#include "abstractaudiooutput.h"
+#include "backend.h"
+#include "medianode.h"
+#include <phonon/audiodataoutput.h>
+#include <phonon/audiodataoutputinterface.h>
+
+namespace Phonon
+{
+namespace Gstreamer
+{
+    /**
+     * \author Martin Sandsmark <sandsmark@samfundet.no>
+     */
+    class AudioDataOutput : public QObject,
+                            public AudioDataOutputInterface,
+                            public MediaNode
+    {
+        Q_OBJECT
+        Q_INTERFACES(Phonon::AudioDataOutputInterface Phonon::Gstreamer::MediaNode)
+
+        public:
+            AudioDataOutput(Backend *, QObject *);
+            ~AudioDataOutput();
+
+        public Q_SLOTS:
+            int dataSize() const;
+            int sampleRate() const;
+            void setDataSize(int size);
+
+        public:
+            /// callback function for handling new audio data
+            static void processBuffer(GstPad*, GstBuffer*, gpointer);
+
+            Phonon::AudioDataOutput* frontendObject() const { return m_frontend; }
+            void setFrontendObject(Phonon::AudioDataOutput *frontend) { m_frontend = frontend; }
+
+            GstElement *audioElement() { return m_queue; }
+
+            void mediaNodeEvent(const MediaNodeEvent *event);
+
+
+        signals:
+            void dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > &data);
+            void dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<float> > &data);
+            void endOfMedia(int remainingSamples);
+
+        private:
+            void convertAndEmit(const QVector<qint16>&, const QVector<qint16>&);
+
+            GstElement *m_queue;
+            int m_dataSize;
+            QVector<qint16> m_pendingData;
+            Phonon::AudioDataOutput *m_frontend;
+            int m_channels;
+    };
+}} //namespace Phonon::Gstreamer
+
+// vim: sw=4 ts=4 tw=80
+#endif // Phonon_FAKE_AUDIODATAOUTPUT_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audioeffect.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audioeffect.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audioeffect.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audioeffect.cpp	2010-02-23 14:47:28.104613727 +0100
@@ -23,7 +23,7 @@
 #include "gsthelper.h"
 
 #include <gst/gst.h>
-#ifndef QT_NO_PHONON_EFFECT
+
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
@@ -75,5 +75,4 @@ GstElement* AudioEffect::createEffectBin
 } //namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_EFFECT
 #include "moc_audioeffect.cpp"
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audioeffect.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audioeffect.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audioeffect.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audioeffect.h	2010-02-23 14:47:28.104613727 +0100
@@ -29,8 +29,8 @@
 
 #include <gst/gst.h>
 
-#ifndef QT_NO_PHONON_EFFECT
 QT_BEGIN_NAMESPACE
+
 namespace Phonon
 {
 namespace Gstreamer
@@ -49,7 +49,7 @@ namespace Gstreamer
             QString m_effectName;
     };
 }} //namespace Phonon::Gstreamer
+
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_EFFECT
 
 #endif // Phonon_GSTREAMER_AUDIOEFFECT_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audiooutput.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/audiooutput.cpp	2010-02-23 14:47:28.108633568 +0100
@@ -125,6 +125,7 @@ void AudioOutput::setVolume(qreal newVol
 bool AudioOutput::setOutputDevice(int newDevice)
 {
     m_backend->logMessage(Q_FUNC_INFO + QString::number(newDevice), Backend::Info, this);
+
     if (newDevice == m_device)
         return true;
 
@@ -135,20 +136,11 @@ bool AudioOutput::setOutputDevice(int ne
     }
 
     bool success = false;
-    const QList<AudioDevice> deviceList = m_backend->deviceManager()->audioOutputDevices();
-    int deviceIdx = -1;
-    for (int i=0; i<deviceList.size(); i++) {
-        if (deviceList.at(i).id == newDevice) {
-            deviceIdx = i;
-            break;
-        }
-    }
-
-    if (m_audioSink && deviceIdx >= 0) {
+    if (m_audioSink &&  newDevice >= 0) {
         // Save previous state
         GstState oldState = GST_STATE(m_audioSink);
         const QByteArray oldDeviceValue = GstHelper::property(m_audioSink, "device");
-        const QByteArray deviceId = deviceList.at(deviceIdx).gstId;
+        const QByteArray deviceId = m_backend->deviceManager()->gstId(newDevice);
         m_device = newDevice;
 
         // We test if the device can be opened by checking if it can go from NULL to READY state
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/backend.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/backend.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/backend.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/backend.cpp	2010-02-23 14:47:28.108633568 +0100
@@ -18,6 +18,7 @@
 #include "common.h"
 #include "backend.h"
 #include "audiooutput.h"
+#include "audiodataoutput.h"
 #include "audioeffect.h"
 #include "mediaobject.h"
 #include "videowidget.h"
@@ -26,6 +27,7 @@
 #include "message.h"
 #include "volumefadereffect.h"
 #include <gst/interfaces/propertyprobe.h>
+#include <phonon/pulsesupport.h>
 
 #include <QtCore/QSet>
 #include <QtCore/QVariant>
@@ -49,26 +51,28 @@ Backend::Backend(QObject *parent, const 
         , m_debugLevel(Warning)
         , m_isValid(false)
 {
+    // Initialise PulseAudio support
+    PulseSupport *pulse = PulseSupport::getInstance();
+    connect(pulse, SIGNAL(objectDescriptionChanged(ObjectDescriptionType)), SIGNAL(objectDescriptionChanged(ObjectDescriptionType)));
+
     // In order to support reloading, we only set the app name once...
     static bool first = true;
     if (first) {
         first = false;
         g_set_application_name(qApp->applicationName().toUtf8());
     }
-
     GError *err = 0;
     bool wasInit = gst_init_check(0, 0, &err);  //init gstreamer: must be called before any gst-related functions
     if (err)
         g_error_free(err);
 
     qRegisterMetaType<Message>("Message");
-#ifndef QT_NO_PROPERTIES
+
     setProperty("identifier",     QLatin1String("phonon_gstreamer"));
     setProperty("backendName",    QLatin1String("Gstreamer"));
     setProperty("backendComment", QLatin1String("Gstreamer plugin for Phonon"));
     setProperty("backendVersion", QLatin1String("0.2"));
-    setProperty("backendWebsite", QLatin1String("http://qt.nokia.com/"));
-#endif //QT_NO_PROPERTIES
+    setProperty("backendWebsite", QLatin1String("http://qtsoftware.com/"));
 
     //check if we should enable debug output
     QString debugLevelString = qgetenv("PHONON_GST_DEBUG");
@@ -92,6 +96,9 @@ Backend::Backend(QObject *parent, const 
 
 Backend::~Backend() 
 {
+    delete m_effectManager;
+    delete m_deviceManager;
+    PulseSupport::shutdown();
 }
 
 gboolean Backend::busCall(GstBus *bus, GstMessage *msg, gpointer data)
@@ -119,20 +126,15 @@ QObject *Backend::createObject(BackendIn
     case MediaObjectClass:
         return new MediaObject(this, parent);
 
-    case AudioOutputClass: {
-            AudioOutput *ao = new AudioOutput(this, parent);
-            m_audioOutputs.append(ao);
-            return ao;
-        }
-#ifndef QT_NO_PHONON_EFFECT
+    case AudioOutputClass:
+        return new AudioOutput(this, parent);
+
     case EffectClass:
         return new AudioEffect(this, args[0].toInt(), parent);
-#endif //QT_NO_PHONON_EFFECT
+
     case AudioDataOutputClass:
-        logMessage("createObject() : AudioDataOutput not implemented");
-        break;
+        return new AudioDataOutput(this, parent);
 
-#ifndef QT_NO_PHONON_VIDEO
     case VideoDataOutputClass:
         logMessage("createObject() : VideoDataOutput not implemented");
         break;
@@ -141,11 +143,9 @@ QObject *Backend::createObject(BackendIn
             QWidget *widget =  qobject_cast<QWidget*>(parent);
             return new VideoWidget(this, widget);
         }
-#endif //QT_NO_PHONON_VIDEO
-#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
+
     case VolumeFaderEffectClass:
         return new VolumeFaderEffect(this, parent);
-#endif //QT_NO_PHONON_VOLUMEFADEREFFECT
 
     case VisualizationClass:  //Fall through
     default:
@@ -214,14 +214,14 @@ QStringList Backend::availableMimeTypes(
         GstPluginFeature *feature = GST_PLUGIN_FEATURE(iter->data);
         QString klass = gst_element_factory_get_klass(GST_ELEMENT_FACTORY(feature));
 
-        if (klass == QLatin1String("Codec/Decoder") ||
-            klass == QLatin1String("Codec/Decoder/Audio") ||
-            klass == QLatin1String("Codec/Decoder/Video") ||
-            klass == QLatin1String("Codec/Demuxer") ||
-            klass == QLatin1String("Codec/Demuxer/Audio") ||
-            klass == QLatin1String("Codec/Demuxer/Video") ||
-            klass == QLatin1String("Codec/Parser") ||
-            klass == QLatin1String("Codec/Parser/Audio") ||
+        if (klass == QLatin1String("Codec/Decoder") || 
+            klass == QLatin1String("Codec/Decoder/Audio") || 
+            klass == QLatin1String("Codec/Decoder/Video") || 
+            klass == QLatin1String("Codec/Demuxer") || 
+            klass == QLatin1String("Codec/Demuxer/Audio") || 
+            klass == QLatin1String("Codec/Demuxer/Video") || 
+            klass == QLatin1String("Codec/Parser") || 
+            klass == QLatin1String("Codec/Parser/Audio") || 
             klass == QLatin1String("Codec/Parser/Video")) {
 
             const GList *static_templates;
@@ -258,6 +258,10 @@ QList<int> Backend::objectDescriptionInd
     if (!isValid())
         return list;
 
+    PulseSupport *pulse = PulseSupport::getInstance();
+    if (pulse->isActive() && (Phonon::AudioOutputDeviceType == type || Phonon::AudioCaptureDeviceType == type))
+        return pulse->objectDescriptionIndexes(type);
+
     switch (type) {
     case Phonon::AudioOutputDeviceType: {
             QList<AudioDevice> deviceList = deviceManager()->audioOutputDevices();
@@ -291,16 +295,17 @@ QHash<QByteArray, QVariant> Backend::obj
     if (!isValid())
         return ret;
 
+    PulseSupport *pulse = PulseSupport::getInstance();
+    if (pulse->isActive() && (Phonon::AudioOutputDeviceType == type || Phonon::AudioCaptureDeviceType == type))
+        return pulse->objectDescriptionProperties(type, index);
+
     switch (type) {
     case Phonon::AudioOutputDeviceType: {
-            QList<AudioDevice> audioDevices = deviceManager()->audioOutputDevices();
-            foreach(const AudioDevice &device, audioDevices) {
-                if (device.id == index) {
-                    ret.insert("name", device.gstId);
-                    ret.insert("description", device.description);
-                    ret.insert("icon", QLatin1String("audio-card"));
-                    break;
-                }
+            AudioDevice* ad;
+            if ((ad = deviceManager()->audioDevice(index))) {
+                ret.insert("name", ad->gstId);
+                ret.insert("description", ad->description);
+                ret.insert("icon", ad->icon);
             }
         }
         break;
@@ -429,7 +434,7 @@ EffectManager* Backend::effectManager() 
 
 /**
  * Returns a debuglevel that is determined by the
- * PHONON_GSTREAMER_DEBUG environment variable.
+ * PHONON_GST_DEBUG environment variable.
  *
  *  Warning - important warnings
  *  Info    - general info
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/backend.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/backend.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/backend.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/backend.h	2010-02-23 14:47:28.108633568 +0100
@@ -86,7 +86,6 @@ private Q_SLOTS:
 
 private:
     static gboolean busCall(GstBus *bus, GstMessage *msg, gpointer data);
-    QList<QPointer<AudioOutput> > m_audioOutputs;
 
     DeviceManager *m_deviceManager;
     EffectManager *m_effectManager;
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/CMakeLists.txt qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/CMakeLists.txt
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/CMakeLists.txt	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/CMakeLists.txt	2010-02-23 14:47:28.104613727 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2009 Nokia Corporation. All rights reserved.
 # Copyright (C) 2008 Matthias Kretz <kretz@kde.org>
 #
 # This library is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@ include(ConfigureChecks.cmake)
 if (BUILD_PHONON_GSTREAMER)
    include_directories(
 	  ${CMAKE_CURRENT_BINARY_DIR}
-	  ${GSTREAMER_INCLUDE_DIR} 
+	  ${GSTREAMER_INCLUDE_DIR}
 	  ${GLIB2_INCLUDE_DIR}
       ${LIBXML2_INCLUDE_DIR}
 	  ${X11_X11_INCLUDE_PATH})
@@ -34,7 +34,6 @@ if (BUILD_PHONON_GSTREAMER)
 
    set(phonon_gstreamer_SRCS
       audiooutput.cpp
-      artssink.cpp
       backend.cpp
       devicemanager.cpp
       effectmanager.cpp
@@ -50,14 +49,20 @@ if (BUILD_PHONON_GSTREAMER)
       message.cpp
       audioeffect.cpp
       abstractrenderer.cpp
-      x11renderer.cpp
       widgetrenderer.cpp
       glrenderer.cpp
       volumefadereffect.cpp
+      audiodataoutput.cpp
       )
 
-   find_package(Alsa)
-   macro_ensure_version("0.10.22" ${GSTREAMER_VERSION} GSTREAMER_HAS_NONBLOCKING_ALSASINK)
+   if(NOT WIN32)
+      set(phonon_gstreamer_SRCS
+          ${phonon_gstreamer_SRCS}
+          artssink.cpp
+          x11renderer.cpp)
+      macro_optional_find_package(Alsa)
+      macro_ensure_version("0.10.22" ${GSTREAMER_VERSION} GSTREAMER_HAS_NONBLOCKING_ALSASINK)
+   endif(NOT WIN32)
    if(ALSA_FOUND AND NOT GSTREAMER_HAS_NONBLOCKING_ALSASINK)
       add_definitions(-DUSE_ALSASINK2)
       include_directories(${ALSA_INCLUDES})
@@ -78,6 +83,9 @@ if (BUILD_PHONON_GSTREAMER)
    if(ALSA_FOUND)
       target_link_libraries(phonon_gstreamer ${ASOUND_LIBRARY})
    endif(ALSA_FOUND)
+   if(USE_INSTALL_PLUGIN)
+       target_link_libraries(phonon_gstreamer ${GSTREAMER_PLUGIN_PBUTILS_LIBRARIES})
+   endif(USE_INSTALL_PLUGIN)
 
    install(TARGETS phonon_gstreamer DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/phonon_backend)
    install(FILES gstreamer.desktop DESTINATION ${SERVICES_INSTALL_DIR}/phononbackends)
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/ConfigureChecks.cmake qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/ConfigureChecks.cmake
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/ConfigureChecks.cmake	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/ConfigureChecks.cmake	2010-02-23 14:47:28.104613727 +0100
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2009 Nokia Corporation. All rights reserved.
 #
 # This library is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -17,6 +17,7 @@ macro_log_feature(GSTREAMER_FOUND "GStre
 
 macro_optional_find_package(GStreamerPlugins)
 macro_log_feature(GSTREAMER_PLUGIN_VIDEO_LIBRARIES "GStreamer video plugin" "The gstreamer video plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
+macro_log_feature(GSTREAMER_PLUGIN_AUDIO_LIBRARIES "GStreamer audio plugin" "The gstreamer audio plugin (part of gstreamer-plugins-base 0.10) is required for the multimedia gstreamer backend" "http://gstreamer.freedesktop.org/modules/" FALSE "0.10")
 
 macro_optional_find_package(GLIB2)
 macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the gstreamer backend for Phonon" "http://www.gtk.org/download/" FALSE)
@@ -30,8 +31,8 @@ macro_log_feature(LIBXML2_FOUND "LibXml2
 macro_optional_find_package(OpenGL)
 macro_log_feature(OPENGL_FOUND "OpenGL" "OpenGL support is required to compile the gstreamer backend for Phonon" "" FALSE)
 
-if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
+if (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
    set(BUILD_PHONON_GSTREAMER TRUE)
-else (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
+else (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
    set(BUILD_PHONON_GSTREAMER FALSE)
-endif (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
+endif (GSTREAMER_FOUND AND GSTREAMER_PLUGIN_VIDEO_LIBRARIES AND GSTREAMER_PLUGIN_AUDIO_LIBRARIES AND GLIB2_FOUND AND GOBJECT_FOUND AND LIBXML2_FOUND AND OPENGL_FOUND)
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/devicemanager.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/devicemanager.cpp	2010-02-23 14:47:28.108633568 +0100
@@ -24,6 +24,7 @@
 #include "widgetrenderer.h"
 #include "x11renderer.h"
 #include "artssink.h"
+#include "pulsesupport.h"
 
 #ifdef USE_ALSASINK2
 #include "alsasink2.h"
@@ -44,9 +45,12 @@ namespace Gstreamer
 AudioDevice::AudioDevice(DeviceManager *manager, const QByteArray &gstId)
         : gstId(gstId)
 {
-    //get an id
-    static int counter = 0;
-    id = counter++;
+    // This should never be called when PulseAudio is active.
+    Q_ASSERT(!PulseSupport::getInstance()->isActive());
+
+    id = manager->allocateDeviceId();
+    icon = "audio-card";
+
     //get name from device
     if (gstId == "default") {
         description = "Default audio device";
@@ -71,22 +75,25 @@ AudioDevice::AudioDevice(DeviceManager *
 DeviceManager::DeviceManager(Backend *backend)
         : QObject(backend)
         , m_backend(backend)
+        , m_audioDeviceCounter(0)
 {
-    m_audioSink = qgetenv("PHONON_GST_AUDIOSINK");
-    m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE");
-
-#ifndef QT_NO_SETTINGS
     QSettings settings(QLatin1String("Trolltech"));
     settings.beginGroup(QLatin1String("Qt"));
 
+    PulseSupport *pulse = PulseSupport::getInstance();
+    m_audioSink = qgetenv("PHONON_GST_AUDIOSINK");
     if (m_audioSink.isEmpty()) {
         m_audioSink = settings.value(QLatin1String("audiosink"), "Auto").toByteArray().toLower();
+        if (m_audioSink == "auto" && pulse->isActive())
+            m_audioSink = "pulsesink";
     }
+    if ("pulsesink" != m_audioSink)
+        pulse->disable();
 
+    m_videoSinkWidget = qgetenv("PHONON_GST_VIDEOMODE");
     if (m_videoSinkWidget.isEmpty()) {
         m_videoSinkWidget = settings.value(QLatin1String("videomode"), "Auto").toByteArray().toLower();
     }
-#endif //QT_NO_SETTINGS
 
     if (m_backend->isValid())
         updateDeviceList();
@@ -246,7 +253,6 @@ GstElement *DeviceManager::createAudioSi
     return sink;
 }
 
-#ifndef QT_NO_PHONON_VIDEO
 AbstractRenderer *DeviceManager::createVideoRenderer(VideoWidget *parent)
 {
 #if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES)
@@ -269,11 +275,18 @@ AbstractRenderer *DeviceManager::createV
 #endif
     return new WidgetRenderer(parent);
 }
-#endif //QT_NO_PHONON_VIDEO
 
-/*
- * Returns a positive device id or -1 if device
- * does not exist
+/**
+ * Allocate a device id for a new audio device
+ */
+int DeviceManager::allocateDeviceId()
+{
+    return m_audioDeviceCounter++;
+}
+
+
+/**
+ * Returns a positive device id or -1 if device does not exist
  *
  * The gstId is typically in the format hw:1,0
  */
@@ -288,16 +301,30 @@ int DeviceManager::deviceId(const QByteA
 }
 
 /**
- * Get a human-readable description from a device id
+ * Returns a gstId or "default" if device does not exist
+ *
+ * The gstId is typically in the format hw:1,0
  */
-QByteArray DeviceManager::deviceDescription(int id) const
+const QByteArray DeviceManager::gstId(int deviceId)
+{
+    if (!PulseSupport::getInstance()->isActive()) {
+        AudioDevice *ad = audioDevice(deviceId);
+        if (ad)
+            return QByteArray(ad->gstId);
+    }
+    return QByteArray("default");
+}
+
+/**
+* Get the AudioDevice for a given device id
+*/
+AudioDevice* DeviceManager::audioDevice(int id)
 {
     for (int i = 0 ; i < m_audioDeviceList.size() ; ++i) {
-        if (m_audioDeviceList[i].id == id) {
-            return m_audioDeviceList[i].description;
-        }
+        if (m_audioDeviceList[i].id == id)
+            return &m_audioDeviceList[i];
     }
-    return QByteArray();
+    return NULL;
 }
 
 /**
@@ -311,8 +338,11 @@ void DeviceManager::updateDeviceList()
     QList<QByteArray> list;
 
     if (audioSink) {
-        list = GstHelper::extractProperties(audioSink, "device");
-        list.prepend("default");
+        if (!PulseSupport::getInstance()->isActive()) {
+            // If we're using pulse, the PulseSupport class takes care of things for us.
+            list = GstHelper::extractProperties(audioSink, "device");
+            list.prepend("default");
+        }
 
         for (int i = 0 ; i < list.size() ; ++i) {
             QByteArray gstId = list.at(i);
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/devicemanager.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/devicemanager.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/devicemanager.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/devicemanager.h	2010-02-23 14:47:28.108633568 +0100
@@ -42,6 +42,7 @@ public :
     int id;
     QByteArray gstId;
     QByteArray description;
+    QString icon;
 };
 
 class DeviceManager : public QObject {
@@ -51,8 +52,10 @@ public:
     virtual ~DeviceManager();
     const QList<AudioDevice> audioOutputDevices() const;
     GstPad *requestPad(int device) const;
+    int allocateDeviceId();
     int deviceId(const QByteArray &gstId) const;
-    QByteArray deviceDescription(int id) const;
+    const QByteArray gstId(int id);
+    AudioDevice* audioDevice(int id);
     GstElement *createGNOMEAudioSink(Category category);
     GstElement *createAudioSink(Category category = NoCategory);
     AbstractRenderer *createVideoRenderer(VideoWidget *parent);
@@ -68,6 +71,7 @@ private:
     bool canOpenDevice(GstElement *element) const;
     Backend *m_backend;
     QList <AudioDevice> m_audioDeviceList;
+    int m_audioDeviceCounter;
     QTimer m_devicePollTimer;
     QByteArray m_audioSink;
     QByteArray m_videoSinkWidget;
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/effect.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/effect.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/effect.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/effect.cpp	2010-02-23 14:47:28.108633568 +0100
@@ -25,8 +25,8 @@
 
 #include <gst/gst.h>
 
-#ifndef QT_NO_PHONON_EFFECT
 QT_BEGIN_NAMESPACE
+
 namespace Phonon
 {
 namespace Gstreamer
@@ -241,6 +241,6 @@ void Effect::setParameterValue(const Eff
 
 }
 } //namespace Phonon::Gstreamer
+
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_EFFECT
 #include "moc_effect.cpp"
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/effect.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/effect.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/effect.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/effect.h	2010-02-23 14:47:28.108633568 +0100
@@ -28,8 +28,8 @@
 
 #include <gst/gst.h>
 
-#ifndef QT_NO_PHONON_EFFECT
 QT_BEGIN_NAMESPACE
+
 namespace Phonon
 {
 namespace Gstreamer
@@ -58,7 +58,7 @@ namespace Gstreamer
             QList<Phonon::EffectParameter> m_parameterList;
     };
 }} //namespace Phonon::Gstreamer
+
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_EFFECT
 
 #endif // Phonon_GSTREAMER_EFFECT_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/gstreamer.desktop
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/gstreamer.desktop	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/gstreamer.desktop	2010-02-23 14:47:28.108633568 +0100
@@ -10,27 +10,70 @@ Icon=phonon-gstreamer
 InitialPreference=10
 
 Name=GStreamer
+Name[bg]=GStreamer
+Name[ca]=GStreamer
+Name[cs]=GStreamer
+Name[da]=GStreamer
+Name[de]=GStreamer
+Name[el]=GStreamer
+Name[en_GB]=GStreamer
+Name[es]=GStreamer
+Name[et]=GStreamer
+Name[eu]=GStreamer
+Name[fr]=GStreamer
+Name[ga]=GStreamer
+Name[gl]=GStreamer
+Name[hsb]=GStreamer
+Name[hu]=GStreamer
+Name[is]=GStreamer
+Name[it]=GStreamer
+Name[ja]=GStreamer
+Name[ko]=GStreamer
+Name[ku]=GStreamer
+Name[lt]=GStreamer
+Name[lv]=GStreamer
+Name[nds]=GStreamer
+Name[nl]=GStreamer
+Name[nn]=GStreamer
 Name[pa]=ਜੀਸਟੀਰਮਰ
+Name[pl]=GStreamer
+Name[pt]=GStreamer
+Name[pt_BR]=GStreamer
+Name[ru]=GStreamer
+Name[se]=GStreamer
+Name[sk]=GStreamer
+Name[sl]=GStreamer
 Name[sr]=Гстример
+Name[sr@latin]=GStreamer
 Name[sv]=Gstreamer
+Name[tr]=GStreamer
+Name[uk]=GStreamer
 Name[x-test]=xxGStreamerxx
+Name[zh_CN]=GStreamer
+Name[zh_TW]=GStreamer
 
 Comment=Phonon GStreamer backend
 Comment[bg]=Phonon GStreamer
 Comment[ca]=Dorsal GStreamer del Phonon
+Comment[cs]=Phonon GStreamer backend
 Comment[da]=GStreamer-backend til Phonon
 Comment[de]=Phonon-Treiber für GStreamer
 Comment[el]=Σύστημα υποστήριξης GStreamer του Phonon
+Comment[en_GB]=Phonon GStreamer backend
 Comment[es]=Motor GStreamer para Phonon
 Comment[et]=Phononi GStreameri taustaprogramm
+Comment[eu]=Phonon GStreamer backend
 Comment[fr]=Système de gestion GStreamer pour Phonon 
 Comment[ga]=Inneall GStreamer le haghaidh Phonon
 Comment[gl]=Infraestrutura de GStreamer para Phonon
+Comment[hsb]=Phonon GStreamer backend
+Comment[hu]=Phonon GStreamer modul
 Comment[is]=Phonon GStreamer bakendi
 Comment[it]=Motore Gstreamer di Phonon
 Comment[ja]=Phonon GStreamer バックエンド
 Comment[ko]=Phonon GStreamer 백엔드
 Comment[ku]=Binesaza Phonon GStreamer
+Comment[lt]=Phonon GStreamer galinė sąsaja
 Comment[lv]=Phonon GStreamer aizmugure
 Comment[nds]=Phonon-Hülpprogramm GStreamer
 Comment[nl]=GStreamer-backend (Phonon)
@@ -39,6 +82,8 @@ Comment[pa]=ਫੋਨੋਨ ਜਸਟੀ
 Comment[pl]=Obsługa GStreamera przez Phonon
 Comment[pt]=Infra-estrutura do GStreamer para o Phonon
 Comment[pt_BR]=Infraestrutura Phonon GStreamer
+Comment[ru]=Механизм GStreamer для Phonon
+Comment[se]=Phonon GStreamer duogášmohtor
 Comment[sk]=GStreamer podsystém
 Comment[sl]=Phononova hrbtenica GStreamer
 Comment[sr]=Гстример као позадина Фонона
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/mediaobject.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/mediaobject.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/mediaobject.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/mediaobject.cpp	2010-02-23 14:47:28.108633568 +0100
@@ -16,6 +16,7 @@
 */
 #include <cmath>
 #include <gst/interfaces/propertyprobe.h>
+#include <gst/pbutils/install-plugins.h>
 #include "common.h"
 #include "mediaobject.h"
 #include "videowidget.h"
@@ -53,6 +54,7 @@ MediaObject::MediaObject(Backend *backen
         , m_tickTimer(new QTimer(this))
         , m_prefinishMark(0)
         , m_transitionTime(0)
+        , m_isStream(false)
         , m_posAtSeek(-1)
         , m_prefinishMarkReachedNotEmitted(true)
         , m_aboutToFinishEmitted(false)
@@ -79,6 +81,7 @@ MediaObject::MediaObject(Backend *backen
         , m_autoplayTitles(true)
         , m_availableTitles(0)
         , m_currentTitle(1)
+        , m_pendingTitle(1)
 {
     qRegisterMetaType<GstCaps*>("GstCaps*");
     qRegisterMetaType<State>("State");
@@ -87,7 +90,7 @@ MediaObject::MediaObject(Backend *backen
     m_name = "MediaObject" + QString::number(count++);
 
     if (!m_backend->isValid()) {
-        setError(tr("Cannot start playback. \n\nCheck your GStreamer installation and make sure you "
+        setError(tr("Cannot start playback. \n\nCheck your Gstreamer installation and make sure you "
                     "\nhave libgstreamer-plugins-base installed."), Phonon::FatalError);
     } else {
         m_root = this;
@@ -95,8 +98,8 @@ MediaObject::MediaObject(Backend *backen
         m_backend->addBusWatcher(this);
         connect(m_tickTimer, SIGNAL(timeout()), SLOT(emitTick()));
     }
-    connect(this, SIGNAL(stateChanged(Phonon::State,Phonon::State)), 
-            this, SLOT(notifyStateChange(Phonon::State,Phonon::State)));
+    connect(this, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
+            this, SLOT(notifyStateChange(Phonon::State, Phonon::State)));
 
 }
 
@@ -136,6 +139,14 @@ QString stateString(const Phonon::State 
     return QString();
 }
 
+void
+pluginInstallationDone( GstInstallPluginsReturn res, gpointer userData )
+{
+    // Nothing inside yet
+    Q_UNUSED(res);
+    Q_UNUSED(userData);
+}
+
 void MediaObject::saveState()
 {
     //Only first resumeState is respected
@@ -195,13 +206,35 @@ void MediaObject::noMorePadsAvailable ()
     if (m_missingCodecs.size() > 0) {
         bool canPlay = (m_hasAudio || m_videoStreamFound);
         Phonon::ErrorType error = canPlay ? Phonon::NormalError : Phonon::FatalError;
+#ifdef PLUGIN_INSTALL_API
+        GstInstallPluginsContext *ctx = gst_install_plugins_context_new ();
+        gchar *details[2];
+        details[0] = m_missingCodecs[0].toLocal8Bit().data();
+        details[1] = NULL;
+        GstInstallPluginsReturn status;
+
+        status = gst_install_plugins_async( details, ctx, pluginInstallationDone, NULL );
+        gst_install_plugins_context_free ( ctx );
+
+        if ( status != GST_INSTALL_PLUGINS_STARTED_OK )
+        {
+            if( status == GST_INSTALL_PLUGINS_HELPER_MISSING )
+                setError(QString(tr("Missing codec helper script assistant.")), Phonon::FatalError );
+            else
+                setError(QString(tr("Plugin codec installation failed for codec: %0"))
+                        .arg(m_missingCodecs[0].split("|")[3]), error);
+        }
+        m_missingCodecs.clear();
+#else
+        QString codecs = m_missingCodecs.join(", ");
+
         if (error == Phonon::NormalError && m_hasVideo && !m_videoStreamFound) {
             m_hasVideo = false;
             emit hasVideoChanged(false);
         }
-        QString codecs = m_missingCodecs.join(", ");
         setError(QString(tr("A required codec is missing. You need to install the following codec(s) to play this content: %0")).arg(codecs), error);
         m_missingCodecs.clear();
+#endif
     }
 }
 
@@ -226,7 +259,6 @@ void MediaObject::cb_unknown_type (GstEl
     QString value = "unknown codec";
 
     // These functions require GStreamer > 0.10.12
-#ifndef QT_NO_LIBRARY
     static Ptr_gst_pb_utils_init p_gst_pb_utils_init = 0;
     static Ptr_gst_pb_utils_get_codec_description p_gst_pb_utils_get_codec_description = 0;
     if (!p_gst_pb_utils_init) {
@@ -240,15 +272,21 @@ void MediaObject::cb_unknown_type (GstEl
         codecName = p_gst_pb_utils_get_codec_description (caps);
         value = QString::fromUtf8(codecName);
         g_free (codecName);
-    } else
-#endif //QT_NO_LIBRARY
-    {
+    } else {
         // For GStreamer versions < 0.10.12
         GstStructure *str = gst_caps_get_structure (caps, 0);
         value = QString::fromUtf8(gst_structure_get_name (str));
-
     }
-    media->addMissingCodecName(value);
+
+#ifdef PLUGIN_INSTALL_API
+    QString plugins = QString("gstreamer|0.10|%0|%1|decoder-%2")
+        .arg( qApp->applicationName() )
+        .arg( value )
+        .arg( QString::fromUtf8(gst_caps_to_string (caps) ) );
+    media->addMissingCodecName( plugins );
+#else
+    media->addMissingCodecName( value );
+#endif
 }
 
 static void notifyVideoCaps(GObject *obj, GParamSpec *, gpointer data)
@@ -309,7 +347,7 @@ void MediaObject::connectVideo(GstPad *p
             m_backend->logMessage("Video track connected", Backend::Info, this);
             // Note that the notify::caps _must_ be installed after linking to work with Dapper
             m_capsHandler = g_signal_connect(pad, "notify::caps", G_CALLBACK(notifyVideoCaps), this);
- 
+
             if (!m_loading && !m_hasVideo) {
                 m_hasVideo = m_videoStreamFound;
                 emit hasVideoChanged(m_hasVideo);
@@ -368,7 +406,10 @@ bool MediaObject::createPipefromURL(cons
     }
 
     // Create a new datasource based on the input URL
-    QByteArray encoded_cstr_url = url.toEncoded();
+    // add the 'file' scheme if it's missing; the double '/' is needed!
+    QByteArray encoded_cstr_url = (url.scheme() == QLatin1String("") ?
+                    "file://" + url.toEncoded() :
+                    url.toEncoded());
     m_datasource = gst_element_make_from_uri(GST_URI_SRC, encoded_cstr_url.constData(), (const char*)NULL);
     if (!m_datasource)
         return false;
@@ -388,6 +429,14 @@ bool MediaObject::createPipefromURL(cons
             g_object_set (G_OBJECT (m_datasource), "read-speed", 2, (const char*)NULL);
             m_backend->logMessage(QString("new device speed : 2X"), Backend::Info, this);
         }
+  }
+
+    /* make HTTP sources send extra headers so we get icecast
+     * metadata in case the stream is an icecast stream */
+    if (encoded_cstr_url.startsWith("http://")
+        && g_object_class_find_property (G_OBJECT_GET_CLASS (m_datasource), "iradio-mode")) {
+        g_object_set (m_datasource, "iradio-mode", TRUE, NULL);
+        m_isStream = true;
     }
 
     // Link data source into pipeline
@@ -408,7 +457,6 @@ bool MediaObject::createPipefromURL(cons
  */
 bool MediaObject::createPipefromStream(const MediaSource &source)
 {
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     // Remove any existing data source
     if (m_datasource) {
         gst_bin_remove(GST_BIN(m_pipeline), m_datasource);
@@ -430,10 +478,6 @@ bool MediaObject::createPipefromStream(c
         return false;
     }
     return true;
-#else //QT_NO_PHONON_ABSTRACTMEDIASTREAM
-    Q_UNUSED(source);
-    return false;
-#endif
 }
 
 void MediaObject::createPipeline()
@@ -676,7 +720,7 @@ void MediaObject::changeState(State news
         return;
 
     Phonon::State oldState = m_state;
-    m_state = newstate; // m_state must be set before emitting, since 
+    m_state = newstate; // m_state must be set before emitting, since
                         // Error state requires that state() will return the new value
     m_pendingState = newstate;
     emit stateChanged(newstate, oldState);
@@ -861,7 +905,7 @@ void MediaObject::setSource(const MediaS
     // such as failing duration queries etc
     GstState state;
     gst_element_set_state(m_pipeline, GST_STATE_NULL);
-    gst_element_get_state (m_pipeline, &state, NULL, 2000);
+    gst_element_get_state(m_pipeline, &state, NULL, 2000);
 
     m_source = source;
     emit currentSourceChanged(m_source);
@@ -885,7 +929,7 @@ void MediaObject::setSource(const MediaS
     m_aboutToFinishEmitted = false;
     m_error = NoError;
     m_errorString = QString();
-    
+
     m_bufferPercent = 0;
     m_prefinishMarkReachedNotEmitted = true;
     m_aboutToFinishEmitted = false;
@@ -894,11 +938,16 @@ void MediaObject::setSource(const MediaS
     setTotalTime(-1);
     m_atEndOfStream = false;
 
-    // Clear exising meta tags
+    m_availableTitles = 0;
+    m_pendingTitle = 1;
+    m_currentTitle = 1;
+
+    // Clear existing meta tags
     m_metaData.clear();
+    m_isStream = false;
 
     switch (source.type()) {
-    case MediaSource::Url: {            
+    case MediaSource::Url: {
             if (createPipefromURL(source.url()))
                 m_loading = true;
             else
@@ -930,9 +979,9 @@ void MediaObject::setSource(const MediaS
 
     case MediaSource::Disc:
         {
-            QString mediaUrl;
-            switch (source.discType()) {
-            case Phonon::NoDisc:
+       QString mediaUrl;
+       switch (source.discType()) {
+       case Phonon::NoDisc:
                 qWarning() << "I should never get to see a MediaSource that is a disc but doesn't specify which one";
                 return;
             case Phonon::Cd:  // CD tracks can be specified by setting the url in the following way uri=cdda:4
@@ -1004,13 +1053,10 @@ void MediaObject::getStreamInfo()
         emit hasVideoChanged(m_hasVideo);
     }
 
-    m_availableTitles = 1;
-    gint64 titleCount;
-    GstFormat format = gst_format_get_by_nick("track");
-    if (gst_element_query_duration (m_pipeline, &format, &titleCount)) {
-        //check if returned format is still "track",
-        //gstreamer sometimes returns the total time, if tracks information is not available.
-        if (qstrcmp(gst_format_get_name(format), "track") == 0)  {
+    if (m_source.discType() == Phonon::Cd) {
+        gint64 titleCount;
+        GstFormat format = gst_format_get_by_nick("track");
+        if (gst_element_query_duration (m_pipeline, &format, &titleCount)) {
             int oldAvailableTitles = m_availableTitles;
             m_availableTitles = (int)titleCount;
             if (m_availableTitles != oldAvailableTitles) {
@@ -1077,7 +1123,7 @@ void MediaObject::seek(qint64 time)
         }
 
         quint64 current = currentTime();
-        quint64 total = totalTime(); 
+        quint64 total = totalTime();
 
         if (current < total - m_prefinishMark)
             m_prefinishMarkReachedNotEmitted = true;
@@ -1098,7 +1144,7 @@ void MediaObject::emitTick()
 
     if (m_tickInterval > 0 && currentTime != m_previousTickTime) {
         emit tick(currentTime);
-        m_previousTickTime = currentTime;        
+        m_previousTickTime = currentTime;
     }
     if (m_state == Phonon::PlayingState) {
         if (currentTime >= totalTime - m_prefinishMark) {
@@ -1109,7 +1155,12 @@ void MediaObject::emitTick()
         }
         // Prepare load of next source
         if (currentTime >= totalTime - ABOUT_TO_FINNISH_TIME) {
-            if (!m_aboutToFinishEmitted) {
+            if (m_source.type() == MediaSource::Disc &&
+                m_autoplayTitles &&
+                m_availableTitles > 1 &&
+                m_currentTitle < m_availableTitles) {
+                m_aboutToFinishEmitted = false;
+            } else if (!m_aboutToFinishEmitted) {
                 m_aboutToFinishEmitted = true; // track is about to finish
                 emit aboutToFinish();
             }
@@ -1213,7 +1264,7 @@ void MediaObject::handleBusMessage(const
 
     switch (GST_MESSAGE_TYPE (gstMessage)) {
 
-    case GST_MESSAGE_EOS: 
+    case GST_MESSAGE_EOS:
         m_backend->logMessage("EOS recieved", Backend::Info, this);
         handleEndOfStream();
         break;
@@ -1222,14 +1273,98 @@ void MediaObject::handleBusMessage(const
             GstTagList* tag_list = 0;
             gst_message_parse_tag(gstMessage, &tag_list);
             if (tag_list) {
+                TagMap newTags;
+                gst_tag_list_foreach (tag_list, &foreach_tag_function, &newTags);
+                gst_tag_list_free(tag_list);
+
+                // Determine if we should no fake the album/artist tags.
+                // This is a little confusing as we want to fake it on initial
+                // connection where title, album and artist are all missing.
+                // There are however times when we get just other information,
+                // e.g. codec, and so we want to only do clever stuff if we
+                // have a commonly available tag (ORGANIZATION) or we have a
+                // change in title
+                bool fake_it =
+                   (m_isStream
+                    && ((!newTags.contains("TITLE")
+                         && newTags.contains("ORGANIZATION"))
+                        || (newTags.contains("TITLE")
+                            && m_metaData.value("TITLE") != newTags.value("TITLE")))
+                    && !newTags.contains("ALBUM")
+                    && !newTags.contains("ARTIST"));
+
                 TagMap oldMap = m_metaData; // Keep a copy of the old one for reference
-                // Append any new meta tags to the existing tag list
-                gst_tag_list_foreach (tag_list, &foreach_tag_function, &m_metaData);
+
+                // Now we've checked the new data, append any new meta tags to the existing tag list
+                // We cannot use TagMap::iterator as this is a multimap and when streaming data
+                // could in theory be lost.
+                QList<QString> keys = newTags.keys();
+                for (QList<QString>::iterator i = keys.begin(); i != keys.end(); ++i) {
+                    QString key = *i;
+                    if (m_isStream) {
+                        // If we're streaming, we need to remove data in m_metaData
+                        // in order to stop it filling up indefinitely (as it's a multimap)
+                        m_metaData.remove(key);
+                    }
+                    QList<QString> values = newTags.values(key);
+                    for (QList<QString>::iterator j = values.begin(); j != values.end(); ++j) {
+                        QString value = *j;
+                        QString currVal = m_metaData.value(key);
+                        if (!m_metaData.contains(key) || currVal != value) {
+                            m_metaData.insert(key, value);
+                        }
+                    }
+                }
+
                 m_backend->logMessage("Meta tags found", Backend::Info, this);
-                if (oldMap != m_metaData && !m_loading)
-                    emit metaDataChanged(m_metaData);
-                gst_tag_list_free(tag_list);
-            }
+                if (oldMap != m_metaData) {
+                    // This is a bit of a hack to ensure that stream metadata is
+                    // returned. We get as much as we can from the Shoutcast server's
+                    // StreamTitle= header. If further info is decoded from the stream
+                    // itself later, then it will overwrite this info.
+                    if (m_isStream && fake_it) {
+                        m_metaData.remove("ALBUM");
+                        m_metaData.remove("ARTIST");
+
+                        // Detect whether we want to "fill in the blanks"
+                        QString str;
+                        if (m_metaData.contains("TITLE"))
+                        {
+                            str = m_metaData.value("TITLE");
+                            int splitpoint;
+                            // Check to see if our title matches "%s - %s"
+                            // Where neither %s are empty...
+                            if ((splitpoint = str.indexOf(" - ")) > 0
+                                && str.size() > (splitpoint+3)) {
+                                m_metaData.insert("ARTIST", str.left(splitpoint));
+                                m_metaData.replace("TITLE", str.mid(splitpoint+3));
+                            }
+                        } else {
+                            str = m_metaData.value("GENRE");
+                            if (!str.isEmpty())
+                                m_metaData.insert("TITLE", str);
+                            else
+                                m_metaData.insert("TITLE", "Streaming Data");
+                        }
+                        if (!m_metaData.contains("ARTIST")) {
+                            str = m_metaData.value("LOCATION");
+                            if (!str.isEmpty())
+                                m_metaData.insert("ARTIST", str);
+                            else
+                                m_metaData.insert("ARTIST", "Streaming Data");
+                        }
+                        str = m_metaData.value("ORGANIZATION");
+                        if (!str.isEmpty())
+                            m_metaData.insert("ALBUM", str);
+                        else
+                            m_metaData.insert("ALBUM", "Streaming Data");
+                    }
+                    // As we manipulate the title, we need to recompare
+                    // oldMap and m_metaData here...
+                    if (oldMap != m_metaData && !m_loading)
+                        emit metaDataChanged(m_metaData);
+                }
+			}
         }
         break;
 
@@ -1255,6 +1390,9 @@ void MediaObject::handleBusMessage(const
                 m_backend->logMessage("gstreamer: pipeline state set to playing", Backend::Info, this);
                 m_tickTimer->start();
                 changeState(Phonon::PlayingState);
+                if ((m_source.type() == MediaSource::Disc) && (m_currentTitle != m_pendingTitle)) {
+                    setTrack(m_pendingTitle);
+                }
                 if (m_resumeState && m_oldState == Phonon::PlayingState) {
                     seek(m_oldPos);
                     m_resumeState = false;
@@ -1290,6 +1428,9 @@ void MediaObject::handleBusMessage(const
                     changeState(Phonon::StoppedState);
                 m_backend->logMessage("gstreamer: pipeline state set to ready", Backend::Debug, this);
                 m_tickTimer->stop();
+                if ((m_source.type() == MediaSource::Disc) && (m_currentTitle != m_pendingTitle)) {
+                    setTrack(m_pendingTitle);
+                }
                 break;
 
             case GST_STATE_VOID_PENDING :
@@ -1328,7 +1469,7 @@ void MediaObject::handleBusMessage(const
                             setError(err->message, Phonon::FatalError);
                         gst_caps_unref (caps);
                         gst_object_unref (sinkPad);
-                   } 
+                   }
                } else {
                     setError(QString(err->message), Phonon::FatalError);
                }
@@ -1400,8 +1541,8 @@ void MediaObject::handleBusMessage(const
         //case GST_MESSAGE_STEP_DONE:
         //case GST_MESSAGE_LATENCY: only from 0.10.12
         //case GST_MESSAGE_ASYNC_DONE: only from 0.10.13
-    default: 
-        break; 
+    default:
+        break;
     }
 }
 
@@ -1417,7 +1558,8 @@ void MediaObject::handleEndOfStream()
     if (!m_seekable)
         m_atEndOfStream = true;
 
-    if (m_autoplayTitles &&
+    if (m_source.type() == MediaSource::Disc &&
+        m_autoplayTitles &&
         m_availableTitles > 1 &&
         m_currentTitle < m_availableTitles) {
         _iface_setCurrentTitle(m_currentTitle + 1);
@@ -1502,15 +1644,30 @@ int MediaObject::_iface_currentTitle() c
 
 void MediaObject::_iface_setCurrentTitle(int title)
 {
-    GstFormat trackFormat = gst_format_get_by_nick("track");
     m_backend->logMessage(QString("setCurrentTitle %0").arg(title), Backend::Info, this);
-    if ((title == m_currentTitle) || (title < 1) || (title > m_availableTitles))
+    if ((title == m_currentTitle) || (title == m_pendingTitle))
+        return;
+
+    m_pendingTitle = title;
+
+    if (m_state == Phonon::PlayingState || m_state == Phonon::StoppedState) {
+        setTrack(m_pendingTitle);
+    } else {
+        setState(Phonon::StoppedState);
+    }
+}
+
+void MediaObject::setTrack(int title)
+{
+    if (((m_state != Phonon::PlayingState) && (m_state != Phonon::StoppedState)) || (title < 1) || (title > m_availableTitles))
         return;
 
-    m_currentTitle = title;
 
     //let's seek to the beginning of the song
-    if (gst_element_seek_simple(m_pipeline, trackFormat, GST_SEEK_FLAG_FLUSH, m_currentTitle - 1)) {
+    GstFormat trackFormat = gst_format_get_by_nick("track");
+    m_backend->logMessage(QString("setTrack %0").arg(title), Backend::Info, this);
+    if (gst_element_seek_simple(m_pipeline, trackFormat, GST_SEEK_FLAG_FLUSH, title - 1)) {
+        m_currentTitle = title;
         updateTotalTime();
         m_atEndOfStream = false;
         emit titleChanged(title);
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/mediaobject.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/mediaobject.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/mediaobject.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/mediaobject.h	2010-02-23 14:47:28.108633568 +0100
@@ -55,6 +55,7 @@ class MediaObject : public QObject, publ
         , public MediaNode
 {
     friend class Stream;
+    friend class AudioDataOutput;
     Q_OBJECT
     Q_INTERFACES(Phonon::MediaObjectInterface
 #ifndef QT_NO_PHONON_MEDIACONTROLLER
@@ -236,6 +237,7 @@ private:
     int _iface_availableTitles() const;
     int _iface_currentTitle() const;
     void _iface_setCurrentTitle(int title);
+    void setTrack(int title);
 
     bool m_resumeState;
     State m_oldState;
@@ -250,6 +252,7 @@ private:
     MediaSource m_nextSource;
     qint32 m_prefinishMark;
     qint32 m_transitionTime;
+	bool m_isStream;
 
     qint64 m_posAtSeek;
 
@@ -285,6 +288,7 @@ private:
     bool m_autoplayTitles;
     int m_availableTitles;
     int m_currentTitle;
+    int m_pendingTitle;
 };
 }
 } //namespace Phonon::Gstreamer
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/phonon-config-gstreamer.h.cmake qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/phonon-config-gstreamer.h.cmake
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/phonon-config-gstreamer.h.cmake	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/phonon-config-gstreamer.h.cmake	2010-02-23 14:47:28.108633568 +0100
@@ -0,0 +1,5 @@
+/* GStreamer install plugin definitions */
+
+/* If api-plugin is defined */
+#cmakedefine PLUGIN_INSTALL_API 1
+
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/phononsrc.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/phononsrc.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/phononsrc.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/phononsrc.cpp	2010-02-23 14:47:28.108633568 +0100
@@ -109,25 +109,18 @@ static void phonon_src_class_init (Phono
 static void phonon_src_init (PhononSrc * src, PhononSrcClass * g_class)
 {
     Q_UNUSED(g_class);
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     src->device = 0;
-#else
-    Q_UNUSED(src);
-#endif
 }
 
 static void phonon_src_finalize (GObject * object)
 {
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     PhononSrc *src;
     src = GST_PHONON_SRC (object);
     delete src->device;
     src->device = 0;
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
     G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
 static gboolean phonon_src_set_device(PhononSrc * src, StreamReader* device)
 {
     GstState state;
@@ -152,7 +145,6 @@ wrong_state:
         return FALSE;
     }
 }
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
 
 static void phonon_src_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec)
 {
@@ -161,7 +153,6 @@ static void phonon_src_set_property (GOb
     src = GST_PHONON_SRC (object);
 
     switch (prop_id) {
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     case ARG_PHONONSRC:
     {
         StreamReader *dev = (StreamReader*)(g_value_get_pointer(value));
@@ -169,9 +160,6 @@ static void phonon_src_set_property (GOb
             phonon_src_set_device(src, dev);
         break;
     }
-#else
-    Q_UNUSED(value);
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
    default:
        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
        break;
@@ -186,13 +174,9 @@ static void phonon_src_get_property (GOb
     src = GST_PHONON_SRC (object);
 
     switch (prop_id) {
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     case ARG_PHONONSRC:
         g_value_set_pointer(value, src->device);
         break;
-#else //QT_NO_PHONON_ABSTRACTMEDIASTREAM
-    Q_UNUSED(value);
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
         break;
@@ -201,7 +185,6 @@ static void phonon_src_get_property (GOb
 
 static GstFlowReturn phonon_src_create_read (PhononSrc * src, guint64 offset, guint length, GstBuffer ** buffer)
 {
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     Q_ASSERT(src->device);
     if (!src->device)
         return GST_FLOW_ERROR;
@@ -221,13 +204,6 @@ static GstFlowReturn phonon_src_create_r
 
     gst_mini_object_unref(GST_MINI_OBJECT(buf));
     return GST_FLOW_ERROR;
-#else //QT_NO_PHONON_ABSTRACTMEDIASTREAM
-    Q_UNUSED(src);
-    Q_UNUSED(offset);
-    Q_UNUSED(length);
-    Q_UNUSED(buffer);
-    return GST_FLOW_ERROR;
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
 }
 
 static GstFlowReturn phonon_src_create (GstBaseSrc * basesrc, guint64 offset, guint length, GstBuffer ** buffer)
@@ -242,23 +218,19 @@ static GstFlowReturn phonon_src_create (
 static gboolean phonon_src_is_seekable (GstBaseSrc * basesrc)
 {
     PhononSrc *src = GST_PHONON_SRC (basesrc);
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     if (src->device)
         return src->device->streamSeekable();
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
     return false;
 }
 
 static gboolean phonon_src_get_size (GstBaseSrc * basesrc, guint64 * size)
 {
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     PhononSrc *src;
     src = GST_PHONON_SRC (basesrc);
     if (src->device && src->device->streamSeekable()) {
         *size = src->device->streamSize();
         return TRUE;
     }
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
     *size = 0;
     return FALSE;
 }
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/phononsrc.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/phononsrc.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/phononsrc.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/phononsrc.h	2010-02-23 14:47:28.108633568 +0100
@@ -49,9 +49,7 @@ typedef struct _PhononSrcClass PhononSrc
 // PhononSrc:
 struct _PhononSrc {
     GstBaseSrc element;
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     StreamReader *device;
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
 };
 
 struct _PhononSrcClass {
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/qwidgetvideosink.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/qwidgetvideosink.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/qwidgetvideosink.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/qwidgetvideosink.h	2010-02-23 14:47:28.108633568 +0100
@@ -19,6 +19,7 @@
 #define Phonon_GSTREAMER_VIDEOSINK_H
 
 #include "common.h"
+#include "qwidgetvideosink.h"
 
 #include <QtCore/QByteArray>
 #include <QtCore/QEvent>
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/streamreader.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/streamreader.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/streamreader.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/streamreader.cpp	2010-02-23 14:47:28.108633568 +0100
@@ -20,7 +20,7 @@ along with this library.  If not, see <h
 #include <phonon/streaminterface.h>
 
 QT_BEGIN_NAMESPACE
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
+
 namespace Phonon
 {
 namespace Gstreamer
@@ -49,6 +49,5 @@ bool StreamReader::read(quint64 pos, int
 
 }
 }
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
 
 QT_END_NAMESPACE
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/streamreader.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/streamreader.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/streamreader.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/streamreader.h	2010-02-23 14:47:28.108633568 +0100
@@ -23,8 +23,6 @@ along with this library.  If not, see <h
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
-
 namespace Phonon
 {
     class MediaSource;
@@ -93,8 +91,6 @@ private:
     }
 }
 
-#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
-
 QT_END_NAMESPACE
 
 #endif
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/videowidget.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/videowidget.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/videowidget.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/videowidget.cpp	2010-02-23 14:47:28.108633568 +0100
@@ -33,7 +33,6 @@
 #include "widgetrenderer.h"
 #include "x11renderer.h"
 
-#ifndef QT_NO_PHONON_VIDEO
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
@@ -384,6 +383,5 @@ void VideoWidget::mediaNodeEvent(const M
 } //namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_VIDEO
 
 #include "moc_videowidget.cpp"
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/videowidget.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/videowidget.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/videowidget.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/videowidget.h	2010-02-23 14:47:28.108633568 +0100
@@ -25,10 +25,10 @@
 #include "common.h"
 #include "medianode.h"
 #include "abstractrenderer.h"
+#include "videowidget.h"
 
 #include <gst/gst.h>
 
-#ifndef QT_NO_PHONON_VIDEO
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -103,5 +103,5 @@ private:
 } //namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_VIDEO
+
 #endif // Phonon_GSTREAMER_VIDEOWIDGET_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/volumefadereffect.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/volumefadereffect.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/volumefadereffect.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/volumefadereffect.cpp	2010-02-23 14:47:28.112614489 +0100
@@ -21,11 +21,11 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
 namespace Phonon
 {
 namespace Gstreamer
 {
+
 VolumeFaderEffect::VolumeFaderEffect(Backend *backend, QObject *parent) 
     : Effect(backend, parent, AudioSource | AudioSink)
     , m_fadeCurve(Phonon::VolumeFaderEffect::Fade3Decibel)
@@ -156,7 +156,7 @@ bool VolumeFaderEffect::event(QEvent *ev
 }
 
 }} //namespace Phonon::Gstreamer
-#endif //QT_NO_PHONON_VOLUMEFADEREFFECT
+
 QT_END_NAMESPACE
 
 #include "moc_volumefadereffect.cpp"
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/volumefadereffect.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/volumefadereffect.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/volumefadereffect.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/volumefadereffect.h	2010-02-23 14:47:28.112614489 +0100
@@ -30,7 +30,7 @@
 #include <gst/gst.h>
 
 QT_BEGIN_NAMESPACE
-#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
+
 namespace Phonon
 {
 namespace Gstreamer
@@ -64,7 +64,7 @@ namespace Gstreamer
             QTime m_fadeStartTime;
     };
 }} //namespace Phonon::Gstreamer
-#endif //QT_NO_PHONON_VOLUMEFADEREFFECT
+
 QT_END_NAMESPACE
 
 #endif // Phonon_GSTREAMER_VOLUMEFADEREFFECT_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/widgetrenderer.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/widgetrenderer.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/widgetrenderer.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/widgetrenderer.cpp	2010-02-23 14:47:28.112614489 +0100
@@ -32,7 +32,6 @@
 # define GL_TEXTURE2    0x84C2
 #endif
 
-#ifndef QT_NO_PHONON_VIDEO
 QT_BEGIN_NAMESPACE
 
 static void frameRendered()
@@ -149,4 +148,3 @@ bool WidgetRenderer::eventFilter(QEvent 
 } //namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_VIDEO
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/widgetrenderer.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/widgetrenderer.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/widgetrenderer.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/widgetrenderer.h	2010-02-23 14:47:28.112614489 +0100
@@ -26,7 +26,6 @@
 #include <QtOpenGL/QGLWidget>
 #endif
 
-#ifndef QT_NO_PHONON_VIDEO
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -60,5 +59,5 @@ private:
 } //namespace Phonon::Gstreamer
 
 QT_END_NAMESPACE
-#endif //QT_NO_PHONON_VIDEO
+
 #endif // Phonon_GSTREAMER_WIDGETRENDERER_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/x11renderer.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/x11renderer.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/gstreamer/x11renderer.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/gstreamer/x11renderer.cpp	2010-02-23 14:47:28.112614489 +0100
@@ -138,6 +138,7 @@ void X11Renderer::scaleModeChanged(Phono
 void X11Renderer::movieSizeChanged(const QSize &movieSize)
 {
     Q_UNUSED(movieSize);
+
     if (m_renderWidget) {
         m_renderWidget->setGeometry(m_videoWidget->calculateDrawFrameRect());
     }
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/abstractmediastream.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/abstractmediastream.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/abstractmediastream.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/abstractmediastream.cpp	2010-02-23 14:47:28.112614489 +0100
@@ -49,6 +49,7 @@ AbstractMediaStream::AbstractMediaStream
 
 AbstractMediaStream::~AbstractMediaStream()
 {
+    delete d_ptr;
 }
 
 qint64 AbstractMediaStream::streamSize() const
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/abstractmediastream.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/abstractmediastream.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/abstractmediastream.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/abstractmediastream.h	2010-02-23 14:47:28.112614489 +0100
@@ -214,7 +214,7 @@ class PHONON_EXPORT AbstractMediaStream 
         virtual void seekStream(qint64 offset);
 
         AbstractMediaStream(AbstractMediaStreamPrivate &dd, QObject *parent);
-        QScopedPointer<AbstractMediaStreamPrivate> d_ptr;
+        AbstractMediaStreamPrivate *d_ptr;
 };
 
 } // namespace Phonon
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/abstractmediastream_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/abstractmediastream_p.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/abstractmediastream_p.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/abstractmediastream_p.h	2010-02-23 14:47:28.112614489 +0100
@@ -45,7 +45,6 @@ class PHONON_EXPORT AbstractMediaStreamP
     public:
         void setStreamInterface(StreamInterface *);
         void setMediaObjectPrivate(MediaObjectPrivate *);
-        ~AbstractMediaStreamPrivate();
 
     protected:
         AbstractMediaStreamPrivate()
@@ -57,6 +56,7 @@ class PHONON_EXPORT AbstractMediaStreamP
             errorType(NoError)
         {
         }
+        ~AbstractMediaStreamPrivate();
 
         virtual void setStreamSize(qint64 newSize);
         virtual void setStreamSeekable(bool s);
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiodataoutput.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiodataoutput.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiodataoutput.cpp	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiodataoutput.cpp	2010-02-23 14:47:28.112614489 +0100
@@ -0,0 +1,66 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2005 Matthias Kretz <kretz@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "audiodataoutput.h"
+#include "audiodataoutput_p.h"
+#include "factory_p.h"
+
+#define PHONON_CLASSNAME AudioDataOutput
+
+namespace Phonon
+{
+
+PHONON_HEIR_IMPL(AbstractAudioOutput)
+
+PHONON_GETTER(int, dataSize, d->dataSize)
+PHONON_GETTER(int, sampleRate, -1)
+PHONON_SETTER(setDataSize, dataSize, int)
+
+bool AudioDataOutputPrivate::aboutToDeleteBackendObject()
+{
+    Q_ASSERT(m_backendObject);
+    pBACKEND_GET(int, dataSize, "dataSize");
+
+    return AbstractAudioOutputPrivate::aboutToDeleteBackendObject();
+}
+
+void AudioDataOutputPrivate::setupBackendObject()
+{
+    Q_Q(AudioDataOutput);
+    Q_ASSERT(m_backendObject);
+    AbstractAudioOutputPrivate::setupBackendObject();
+
+    // set up attributes
+    pBACKEND_CALL1("setDataSize", int, dataSize);
+
+    qRegisterMetaType<QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > >("QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> >");
+
+    QObject::connect(m_backendObject,
+            SIGNAL(dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > &)),
+            q, SIGNAL(dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > &)));
+    QObject::connect(m_backendObject, SIGNAL(endOfMedia(int)), q, SIGNAL(endOfMedia(int)));
+}
+
+} // namespace Phonon
+
+#undef PHONON_CLASSNAME
+// vim: sw=4 ts=4 tw=80
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiodataoutput.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiodataoutput.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiodataoutput.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiodataoutput.h	2010-02-23 14:47:28.116637810 +0100
@@ -0,0 +1,129 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+#ifndef Phonon_AUDIODATAOUTPUT_H
+#define Phonon_AUDIODATAOUTPUT_H
+
+#include "phonon_export.h"
+#include "abstractaudiooutput.h"
+#include "phonondefs.h"
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+template<typename T> class QVector;
+template<typename Key, typename T> class QMap;
+#endif
+
+namespace Phonon
+{
+    class AudioDataOutputPrivate;
+
+    /**
+     * \short This class gives you the audio data (for visualizations).
+     *
+     * This class implements a special AbstractAudioOutput that gives your
+     * application the audio data. Don't expect realtime performance. But
+     * the latencies should be low enough to use the audio data for
+     * visualizations. You can also use the audio data for further processing
+     * (e.g. encoding and saving to a file).
+     *
+     * \author Matthias Kretz <kretz@kde.org>
+     */
+    class PHONON_EXPORT AudioDataOutput : public AbstractAudioOutput
+    {
+        Q_OBJECT
+        K_DECLARE_PRIVATE(AudioDataOutput)
+        Q_ENUMS(Channel)
+        Q_PROPERTY(int dataSize READ dataSize WRITE setDataSize)
+        PHONON_HEIR(AudioDataOutput)
+        public:
+            /**
+             * Specifies the channel the audio data belongs to.
+             */
+            enum Channel
+            {
+                LeftChannel,
+                RightChannel,
+                CenterChannel,
+                LeftSurroundChannel,
+                RightSurroundChannel,
+                SubwooferChannel
+            };
+
+            /**
+             * Returns the currently used number of samples passed through
+             * the signal.
+             *
+             * \see setDataSize
+             */
+            int dataSize() const;
+
+            /**
+             * Returns the sample rate in Hz. Common sample rates are 44100 Hz
+             * and 48000 Hz. AudioDataOutput will not do any sample rate
+             * conversion for you. If you need to convert the sample rate you
+             * might want to take a look at libsamplerate. For visualizations it
+             * is often enough to do simple interpolation or even drop/duplicate
+             * samples.
+             *
+             * \return The sample rate as reported by the backend. If the
+             * backend is unavailable -1 is returned.
+             */
+            int sampleRate() const;
+
+        public Q_SLOTS:
+            /**
+             * Sets the number of samples to be passed in one signal emission.
+             *
+             * Defaults to 512 samples per emitted signal.
+             *
+             * \param size the number of samples
+             */
+            void setDataSize(int size);
+
+        Q_SIGNALS:
+            /**
+             * Emitted whenever another dataSize number of samples are ready.
+             *
+             * \param data A mapping of Channel to a vector holding the audio data.
+             */
+            void dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVector<qint16> > &data);
+
+
+            /**
+             * This signal is emitted before the last dataReady signal of a
+             * media is emitted.
+             *
+             * If, for example, the playback of a media file has finished and the
+             * last audio data of that file is going to be passed with the next
+             * dataReady signal, and only the 28 first samples of the data
+             * vector are from that media file endOfMedia will be emitted right
+             * before dataReady with \p remainingSamples = 28.
+             *
+             * \param remainingSamples The number of samples in the next
+             * dataReady vector that belong to the media that was playing to
+             * this point.
+             */
+            void endOfMedia(int remainingSamples);
+    };
+} // namespace Phonon
+
+// vim: sw=4 ts=4 tw=80
+#endif // Phonon_AUDIODATAOUTPUT_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiodataoutputinterface.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiodataoutputinterface.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiodataoutputinterface.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiodataoutputinterface.h	2010-02-23 14:47:28.116637810 +0100
@@ -0,0 +1,44 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2008 Matthias Kretz <kretz@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef PHONON_AUDIODATAOUTPUTINTERFACE_H
+#define PHONON_AUDIODATAOUTPUTINTERFACE_H
+
+namespace Phonon
+{
+
+class AudioDataOutput;
+
+class AudioDataOutputInterface
+{
+    public:
+        virtual ~AudioDataOutputInterface() {}
+
+        virtual AudioDataOutput *frontendObject() const = 0;
+        virtual void setFrontendObject(AudioDataOutput *) = 0;
+};
+
+} // namespace Phonon
+
+Q_DECLARE_INTERFACE(Phonon::AudioDataOutputInterface, "0AudioDataOutputInterface.phonon.kde.org")
+
+#endif // PHONON_AUDIODATAOUTPUTINTERFACE_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiodataoutput_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiodataoutput_p.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiodataoutput_p.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiodataoutput_p.h	2010-02-23 14:47:28.116637810 +0100
@@ -0,0 +1,48 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2006 Matthias Kretz <kretz@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef AUDIODATAOUTPUT_P_H
+#define AUDIODATAOUTPUT_P_H
+
+#include "audiodataoutput.h"
+#include "abstractaudiooutput_p.h"
+
+namespace Phonon
+{
+
+class AudioDataOutputPrivate : public AbstractAudioOutputPrivate
+{
+    Q_DECLARE_PUBLIC(AudioDataOutput)
+    PHONON_PRIVATECLASS
+    protected:
+        AudioDataOutputPrivate()
+            : dataSize(512)
+        {
+        }
+
+        int dataSize;
+};
+
+} // namespace Phonon
+
+#endif // AUDIODATAOUTPUT_P_H
+// vim: sw=4 ts=4 tw=80
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiooutput.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiooutput.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiooutput.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiooutput.cpp	2010-02-23 14:47:28.116637810 +0100
@@ -24,10 +24,11 @@
 #include "factory_p.h"
 #include "objectdescription.h"
 #include "audiooutputadaptor_p.h"
-#include "globalconfig_p.h"
+#include "globalconfig.h"
 #include "audiooutputinterface.h"
 #include "phononnamespace_p.h"
 #include "platform_p.h"
+#include "pulsesupport.h"
 
 #include <QtCore/qmath.h>
 
@@ -42,8 +43,12 @@ QT_BEGIN_NAMESPACE
 namespace Phonon
 {
 
-static inline bool callSetOutputDevice(MediaNodePrivate *const d, int index)
+static inline bool callSetOutputDevice(AudioOutputPrivate *const d, int index)
 {
+    PulseSupport *pulse = PulseSupport::getInstance();
+    if (pulse->isActive())
+        return pulse->setOutputDevice(d->getStreamUuid(), index);
+
     Iface<IFACES2> iface(d);
     if (iface) {
         return iface->setOutputDevice(AudioOutputDevice::fromIndex(index));
@@ -51,8 +56,12 @@ static inline bool callSetOutputDevice(M
     return Iface<IFACES0>::cast(d)->setOutputDevice(index);
 }
 
-static inline bool callSetOutputDevice(MediaNodePrivate *const d, const AudioOutputDevice &dev)
+static inline bool callSetOutputDevice(AudioOutputPrivate *const d, const AudioOutputDevice &dev)
 {
+    PulseSupport *pulse = PulseSupport::getInstance();
+    if (pulse->isActive())
+        return pulse->setOutputDevice(d->getStreamUuid(), dev.index());
+
     Iface<IFACES2> iface(d);
     if (iface) {
         return iface->setOutputDevice(dev);
@@ -89,6 +98,8 @@ void AudioOutputPrivate::init(Phonon::Ca
 #endif
 
     category = c;
+    streamUuid = QUuid::createUuid().toString();
+    PulseSupport::getInstance()->setStreamPropList(category, streamUuid);
 
     // select hardware device according to the category
     device = AudioOutputDevice::fromIndex(GlobalConfig().audioOutputDeviceFor(category, GlobalConfig::AdvancedDevicesFromSettings | GlobalConfig::HideUnavailableDevices));
@@ -98,7 +109,10 @@ void AudioOutputPrivate::init(Phonon::Ca
     q->connect(Factory::sender(), SIGNAL(availableAudioOutputDevicesChanged()), SLOT(_k_deviceListChanged()));
 }
 
-
+QString AudioOutputPrivate::getStreamUuid()
+{
+    return streamUuid;
+}
 
 void AudioOutputPrivate::createBackendObject()
 {
@@ -234,7 +248,7 @@ bool AudioOutput::setOutputDevice(const 
         d->device = newAudioOutputDevice;
     }
     if (k_ptr->backendObject()) {
-        return callSetOutputDevice(k_ptr, d->device.index());
+        return callSetOutputDevice(d, d->device.index());
     }
     return true;
 }
@@ -259,7 +273,6 @@ void AudioOutputPrivate::setupBackendObj
     // set up attributes
     pINTERFACE_CALL(setVolume(pow(volume, VOLTAGE_TO_LOUDNESS_EXPONENT)));
 
-#ifndef QT_NO_PHONON_SETTINGSGROUP
     // if the output device is not available and the device was not explicitly set
     if (!callSetOutputDevice(this, device) && !outputDeviceOverridden) {
         // fall back in the preference list of output devices
@@ -267,8 +280,8 @@ void AudioOutputPrivate::setupBackendObj
         if (deviceList.isEmpty()) {
             return;
         }
-        for (int i = 0; i < deviceList.count(); ++i) {
-            const AudioOutputDevice &dev = AudioOutputDevice::fromIndex(deviceList.at(i));
+        foreach (int devIndex, deviceList) {
+            const AudioOutputDevice &dev = AudioOutputDevice::fromIndex(devIndex);
             if (callSetOutputDevice(this, dev)) {
                 handleAutomaticDeviceChange(dev, AudioOutputPrivate::FallbackChange);
                 return; // found one that works
@@ -279,7 +292,6 @@ void AudioOutputPrivate::setupBackendObj
         callSetOutputDevice(this, none);
         handleAutomaticDeviceChange(none, FallbackChange);
     }
-#endif //QT_NO_PHONON_SETTINGSGROUP
 }
 
 void AudioOutputPrivate::_k_volumeChanged(qreal newVolume)
@@ -309,10 +321,8 @@ void AudioOutputPrivate::_k_audioDeviceF
     pDebug() << Q_FUNC_INFO;
     // outputDeviceIndex identifies a failing device
     // fall back in the preference list of output devices
-#ifndef QT_NO_PHONON_SETTINGSGROUP
-    const QList<int> deviceList = GlobalConfig().audioOutputDeviceListFor(category, GlobalConfig::AdvancedDevicesFromSettings | GlobalConfig::HideUnavailableDevices);
-    for (int i = 0; i < deviceList.count(); ++i) {
-        const int devIndex = deviceList.at(i);
+    QList<int> deviceList = GlobalConfig().audioOutputDeviceListFor(category, GlobalConfig::AdvancedDevicesFromSettings | GlobalConfig::HideUnavailableDevices);
+    foreach (int devIndex, deviceList) {
         // if it's the same device as the one that failed, ignore it
         if (device.index() != devIndex) {
             const AudioOutputDevice &info = AudioOutputDevice::fromIndex(devIndex);
@@ -322,7 +332,6 @@ void AudioOutputPrivate::_k_audioDeviceF
             }
         }
     }
-#endif //QT_NO_PHONON_SETTINGSGROUP
     // if we get here there is no working output device. Tell the backend.
     const AudioOutputDevice none;
     callSetOutputDevice(this, none);
@@ -332,12 +341,10 @@ void AudioOutputPrivate::_k_audioDeviceF
 void AudioOutputPrivate::_k_deviceListChanged()
 {
     pDebug() << Q_FUNC_INFO;
-#ifndef QT_NO_PHONON_SETTINGSGROUP
     // let's see if there's a usable device higher in the preference list
-    const QList<int> deviceList = GlobalConfig().audioOutputDeviceListFor(category, GlobalConfig::AdvancedDevicesFromSettings);
+    QList<int> deviceList = GlobalConfig().audioOutputDeviceListFor(category, GlobalConfig::AdvancedDevicesFromSettings);
     DeviceChangeType changeType = HigherPreferenceChange;
-    for (int i = 0; i < deviceList.count(); ++i) {
-        const int devIndex = deviceList.at(i);
+    foreach (int devIndex, deviceList) {
         const AudioOutputDevice &info = AudioOutputDevice::fromIndex(devIndex);
         if (!info.property("available").toBool()) {
             if (device.index() == devIndex) {
@@ -358,7 +365,6 @@ void AudioOutputPrivate::_k_deviceListCh
             break; // found one with higher preference that works
         }
     }
-#endif //QT_NO_PHONON_SETTINGSGROUP
 }
 
 static struct
@@ -410,6 +416,7 @@ void AudioOutputPrivate::handleAutomatic
 
 AudioOutputPrivate::~AudioOutputPrivate()
 {
+    PulseSupport::getInstance()->clearStreamCache(streamUuid);
 #ifndef QT_NO_DBUS
     if (adaptor) {
         emit adaptor->outputDestroyed();
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiooutput_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiooutput_p.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/audiooutput_p.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/audiooutput_p.h	2010-02-23 14:47:28.116637810 +0100
@@ -46,6 +46,7 @@ class AudioOutputPrivate : public Abstra
             return 0;
         }
         void init(Phonon::Category c);
+        QString getStreamUuid();
 
 
     protected:
@@ -79,6 +80,7 @@ class AudioOutputPrivate : public Abstra
         QString name;
         Phonon::AudioOutputDevice device;
         qreal volume;
+        QString streamUuid;
 #ifndef QT_NO_DBUS
         Phonon::AudioOutputAdaptor *adaptor;
 #endif
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/backendcapabilities.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/backendcapabilities.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/backendcapabilities.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/backendcapabilities.cpp	2010-02-23 14:47:28.116637810 +0100
@@ -26,7 +26,7 @@
 #include "phonondefs_p.h"
 #include "backendinterface.h"
 #include "factory_p.h"
-#include "globalconfig_p.h"
+#include "globalconfig.h"
 #include "globalstatic_p.h"
 #include "objectdescription.h"
 
@@ -75,12 +75,10 @@ bool BackendCapabilities::isMimeTypeAvai
 QList<AudioOutputDevice> BackendCapabilities::availableAudioOutputDevices()
 {
     QList<AudioOutputDevice> ret;
-#ifndef QT_NO_PHONON_SETTINGSGROUP
     const QList<int> deviceIndexes = GlobalConfig().audioOutputDeviceListFor(Phonon::NoCategory);
-    for (int i = 0; i < deviceIndexes.count(); ++i) {
-        ret.append(AudioOutputDevice::fromIndex(deviceIndexes.at(i)));
+    foreach (int i, deviceIndexes) {
+        ret.append(AudioOutputDevice::fromIndex(i));
     }
-#endif //QT_NO_PHONON_SETTINGSGROUP
     return ret;
 }
 
@@ -90,8 +88,8 @@ QList<AudioCaptureDevice> BackendCapabil
 {
     QList<AudioCaptureDevice> ret;
     const QList<int> deviceIndexes = GlobalConfig().audioCaptureDeviceListFor(Phonon::NoCategory);
-    for (int i = 0; i < deviceIndexes.count(); ++i) {
-        ret.append(AudioCaptureDevice::fromIndex(deviceIndexes.at(i)));
+    foreach (int i, deviceIndexes) {
+        ret.append(AudioCaptureDevice::fromIndex(i));
     }
     return ret;
 }
@@ -103,9 +101,9 @@ QList<EffectDescription> BackendCapabili
     BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend());
     QList<EffectDescription> ret;
     if (backendIface) {
-        const QList<int> deviceIndexes = backendIface->objectDescriptionIndexes(Phonon::EffectType);
-        for (int i = 0; i < deviceIndexes.count(); ++i) {
-            ret.append(EffectDescription::fromIndex(deviceIndexes.at(i)));
+        QList<int> deviceIndexes = backendIface->objectDescriptionIndexes(Phonon::EffectType);
+        foreach (int i, deviceIndexes) {
+            ret.append(EffectDescription::fromIndex(i));
         }
     }
     return ret;
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/backendcapabilities.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/backendcapabilities.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/backendcapabilities.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/backendcapabilities.h	2010-02-23 14:47:28.116637810 +0100
@@ -15,7 +15,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
+    You should have received a copy of the GNU Lesser General Public 
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
@@ -88,18 +88,19 @@ namespace BackendCapabilities
     };
 
     /**
-     * Use this function to get a QObject pointer to connect to one of the Notifier signals.
+     * Use this function to get a QObject pointer to connect to the capabilitiesChanged signal.
      *
      * \return a pointer to a QObject.
      *
-     * To connect to the signal do the following:
+     * The capabilitiesChanged signal is emitted if the capabilities have changed. This can
+     * happen if the user has requested a backend change.
+     *
+     * To connect to this signal do the following:
      * \code
      * QObject::connect(BackendCapabilities::notifier(), SIGNAL(capabilitiesChanged()), ...
      * \endcode
      *
      * \see Notifier::capabilitiesChanged()
-     * \see Notifier::availableAudioOutputDevicesChanged()
-     * \see Notifier::availableAudioCaptureDevicesChanged()
      */
     PHONON_EXPORT Notifier *notifier();
 
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/CMakeLists.txt qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/CMakeLists.txt
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/CMakeLists.txt	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/CMakeLists.txt	2010-02-23 14:47:28.112614489 +0100
@@ -8,6 +8,22 @@ endif (PHONON_BUILD_EXAMPLES)
 
 add_subdirectory(experimental)
 
+set(PULSEAUDIO_MINIMUM_VERSION "0.9.21")
+macro_optional_find_package(PulseAudio)
+macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "A cross-platform, networked sound server." "http://www.pulseaudio.org" FALSE "" "Allows audio playback via the PulseAudio soundserver when it is running")
+macro_optional_find_package(GLIB2)
+macro_log_feature(GLIB2_FOUND "GLib2" "GLib 2 is required to compile the pulseaudio for Phonon" "http://www.gtk.org/download/" FALSE)
+
+if (GLIB2_FOUND AND PULSEAUDIO_FOUND)
+   add_definitions(-DHAVE_PULSEAUDIO)
+   include_directories(${GLIB2_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR})
+else(GLIB2_FOUND AND PULSEAUDIO_FOUND)
+   set(PULSEAUDIO_INCLUDE_DIR "")
+   set(PULSEAUDIO_LIBRARY "")
+   set(PULSEAUDIO_MAINLOOP_LIBRARY "")
+endif(GLIB2_FOUND AND PULSEAUDIO_FOUND)
+
+
 set(phonon_LIB_SRCS
    objectdescription.cpp
    objectdescriptionmodel.cpp
@@ -35,9 +51,12 @@ set(phonon_LIB_SRCS
    videowidget.cpp
    videoplayer.cpp
    seekslider.cpp
+   swiftslider.cpp
    volumeslider.cpp
    effectwidget.cpp
    iodevicestream.cpp
+   audiodataoutput.cpp
+   pulsesupport.cpp
    )
 
 if (QT_QTDBUS_FOUND)
@@ -50,6 +69,10 @@ endif (QT_QTDBUS_FOUND)
 add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins")
 automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS})
 target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+if (GLIB2_FOUND AND PULSEAUDIO_FOUND)
+target_link_libraries(phonon ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY})
+endif (GLIB2_FOUND AND PULSEAUDIO_FOUND)
+
 if (QT_QTDBUS_FOUND)
   target_link_libraries(phonon ${QT_QTDBUS_LIBRARY})
 endif (QT_QTDBUS_FOUND)
@@ -99,6 +122,9 @@ install(FILES
    volumeslider.h
    effectwidget.h
    platformplugin.h
+   audiodataoutput.h
+   audiodataoutputinterface.h
+   globalconfig.h
    DESTINATION ${INCLUDE_INSTALL_DIR}/phonon COMPONENT Devel)
 
 install(FILES org.kde.Phonon.AudioOutput.xml  DESTINATION  ${DBUS_INTERFACES_INSTALL_DIR})
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/effect.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/effect.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/effect.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/effect.cpp	2010-02-23 14:47:28.116637810 +0100
@@ -107,8 +107,7 @@ bool EffectPrivate::aboutToDeleteBackend
 {
     if (m_backendObject) {
         const QList<EffectParameter> parameters = pINTERFACE_CALL(parameters());
-        for (int i = 0; i < parameters.count(); ++i) {
-            const EffectParameter &p = parameters.at(i);
+        foreach (const EffectParameter &p, parameters) {
             parameterValues[p] = pINTERFACE_CALL(parameterValue(p));
         }
     }
@@ -121,8 +120,7 @@ void EffectPrivate::setupBackendObject()
 
     // set up attributes
     const QList<EffectParameter> parameters = pINTERFACE_CALL(parameters());
-    for (int i = 0; i < parameters.count(); ++i) {
-        const EffectParameter &p = parameters.at(i);
+    foreach (const EffectParameter &p, parameters) {
         pINTERFACE_CALL(setParameterValue(p, parameterValues[p]));
     }
 }
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/effectwidget.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/effectwidget.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/effectwidget.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/effectwidget.cpp	2010-02-23 14:47:28.120629771 +0100
@@ -97,9 +97,7 @@ void EffectWidgetPrivate::autogenerateUi
     Q_Q(EffectWidget);
     QVBoxLayout *mainLayout = new QVBoxLayout(q);
     mainLayout->setMargin(0);
-    const QList<Phonon::EffectParameter> parameters = effect->parameters();
-    for (int i = 0; i < parameters.count(); ++i) {
-        const EffectParameter &para = parameters.at(i);
+    foreach (const EffectParameter &para, effect->parameters()) {
         QVariant value = effect->parameterValue(para);
         QHBoxLayout *pLayout = new QHBoxLayout;
         mainLayout->addLayout(pLayout);
@@ -119,14 +117,13 @@ void EffectWidgetPrivate::autogenerateUi
                 control = cb;
                 if (value.type() == QVariant::Int) {
                     //value just defines the item index
-                    for (int i = 0; i < para.possibleValues().count(); ++i) {
-                        cb->addItem(para.possibleValues().at(i).toString());
+                    foreach (const QVariant &item, para.possibleValues()) {
+                        cb->addItem(item.toString());
                     }
                     cb->setCurrentIndex(value.toInt());
                     QObject::connect(cb, SIGNAL(currentIndexChanged(int)), q, SLOT(_k_setIntParameter(int)));
                 } else {
-                    for (int i = 0; i < para.possibleValues().count(); ++i) {
-                        const QVariant &item = para.possibleValues().at(i);
+                    foreach (const QVariant &item, para.possibleValues()) {
                         cb->addItem(item.toString());
                         if (item == value) {
                             cb->setCurrentIndex(cb->count() - 1);
@@ -158,20 +155,18 @@ void EffectWidgetPrivate::autogenerateUi
                 QObject::connect(sb, SIGNAL(valueChanged(int)), q, SLOT(_k_setIntParameter(int)));
             }
             break;
-        case QMetaType::Float:
         case QVariant::Double:
             {
-                const qreal minValue = para.minimumValue().canConvert(QVariant::Double) ?
-                    para.minimumValue().toReal() : DEFAULT_MIN;
-                const qreal maxValue = para.maximumValue().canConvert(QVariant::Double) ?
-                    para.maximumValue().toReal() : DEFAULT_MAX;
+                const double minValue = (para.minimumValue().type() == QVariant::Double ?
+                    para.minimumValue().toDouble() : DEFAULT_MIN);
+                const double maxValue = (para.maximumValue().type() == QVariant::Double ?
+                    para.maximumValue().toDouble() : DEFAULT_MAX);
 
                 if (minValue == -1. && maxValue == 1.) {
                     //Special case values between -1 and 1.0 to use a slider for improved usability
                     QSlider *slider = new QSlider(Qt::Horizontal, q);
-                    control = slider;
                     slider->setRange(-SLIDER_RANGE, +SLIDER_RANGE);
-                    slider->setValue(int(SLIDER_RANGE * value.toReal()));
+                    slider->setValue(int(SLIDER_RANGE * value.toDouble()));
                     slider->setTickPosition(QSlider::TicksBelow);
                     slider->setTickInterval(TICKINTERVAL);
                     QObject::connect(slider, SIGNAL(valueChanged(int)), q, SLOT(_k_setSliderParameter(int)));
@@ -193,10 +188,10 @@ void EffectWidgetPrivate::autogenerateUi
             break;
         }
 
-        if (control) {
 #ifndef QT_NO_TOOLTIP
         control->setToolTip(para.description());
 #endif
+        if (control) {
 #ifndef QT_NO_SHORTCUT
             label->setBuddy(control);
 #endif
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/factory.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/factory.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/factory.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/factory.cpp	2010-02-23 14:47:28.308614154 +0100
@@ -111,7 +111,6 @@ void Factory::setBackend(QObject *b)
 
 bool FactoryPrivate::createBackend()
 {
-#ifndef QT_NO_LIBRARY
     Q_ASSERT(m_backendObject == 0);
 #ifndef QT_NO_PHONON_PLATFORMPLUGIN
     PlatformPlugin *f = globalFactory->platformPlugin();
@@ -125,39 +124,15 @@ bool FactoryPrivate::createBackend()
         // could not load a backend through the platform plugin. Falling back to the default
         // (finding the first loadable backend).
         const QLatin1String suffix("/phonon_backend/");
-        const QStringList paths = QCoreApplication::libraryPaths();
-        for (int i = 0; i < paths.count(); ++i) {
-            const QString libPath = paths.at(i) + suffix;
+        foreach (QString libPath, QCoreApplication::libraryPaths()) {
+            libPath += suffix;
             const QDir dir(libPath);
             if (!dir.exists()) {
                 pDebug() << Q_FUNC_INFO << dir.absolutePath() << "does not exist";
                 continue;
             }
-
-			QStringList plugins(dir.entryList(QDir::Files));
-
-#ifdef Q_OS_SYMBIAN
-            /* On Symbian OS we might have two plugins, one which uses Symbian
-             * MMF framework("phonon_mmf"), and one which uses Real Networks's
-             * Helix("hxphonon"). We prefer the latter because it's more
-             * sophisticated, so we make sure the Helix backend is attempted
-             * to be loaded first, and the MMF backend is used for backup. */
-            {
-
-                const int hxphonon = plugins.indexOf(QLatin1String("hxphonon"));
-                if (hxphonon != -1)
-                    plugins.move(hxphonon, 0);
-
-                // Code for debugging the MMF backend.
-                if(hxphonon != -1) {
-                    qDebug() << "Found hxphonon backend and removed it from the lookup list.";
-                    plugins.removeAll(QLatin1String("hxphonon"));
-                }
-            }
-#endif
-
-            for (int i = 0; i < plugins.count(); ++i) {
-                QPluginLoader pluginLoader(libPath + plugins.at(i));
+            foreach (const QString &pluginName, dir.entryList(QDir::Files)) {
+                QPluginLoader pluginLoader(libPath + pluginName);
                 if (!pluginLoader.load()) {
                     pDebug() << Q_FUNC_INFO << "  load failed:"
                              << pluginLoader.errorString();
@@ -187,20 +162,14 @@ bool FactoryPrivate::createBackend()
             SLOT(objectDescriptionChanged(ObjectDescriptionType)));
 
     return true;
-#else //QT_NO_LIBRARY
-    pWarning() << Q_FUNC_INFO << "Trying to use Phonon with QT_NO_LIBRARY defined. "
-                                 "That is currently not supported";
-    return false;
-#endif
 }
 
 FactoryPrivate::FactoryPrivate()
-    :
 #ifndef QT_NO_PHONON_PLATFORMPLUGIN
-    m_platformPlugin(0),
-    m_noPlatformPlugin(false),
+    : m_platformPlugin(0),
+    m_noPlatformPlugin(false)
 #endif //QT_NO_PHONON_PLATFORMPLUGIN
-    m_backendObject(0)
+    , m_backendObject(0)
 {
     // Add the post routine to make sure that all other global statics (especially the ones from Qt)
     // are still available. If the FactoryPrivate dtor is called too late many bad things can happen
@@ -214,8 +183,14 @@ FactoryPrivate::FactoryPrivate()
 
 FactoryPrivate::~FactoryPrivate()
 {
-    for (int i = 0; i < mediaNodePrivateList.count(); ++i) {
-        mediaNodePrivateList.at(i)->deleteBackendObject();
+    foreach (QObject *o, objects) {
+        MediaObject *m = qobject_cast<MediaObject *>(o);
+        if (m) {
+            m->stop();
+        }
+    }
+    foreach (MediaNodePrivate *bp, mediaNodePrivateList) {
+        bp->deleteBackendObject();
     }
     if (objects.size() > 0) {
         pError() << "The backend objects are not deleted as was requested.";
@@ -283,8 +258,8 @@ void Factory::deregisterFrontendObject(M
 void FactoryPrivate::phononBackendChanged()
 {
     if (m_backendObject) {
-        for (int i = 0; i < mediaNodePrivateList.count(); ++i) {
-            mediaNodePrivateList.at(i)->deleteBackendObject();
+        foreach (MediaNodePrivate *bp, mediaNodePrivateList) {
+            bp->deleteBackendObject();
         }
         if (objects.size() > 0) {
             pDebug() << "WARNING: we were asked to change the backend but the application did\n"
@@ -293,8 +268,8 @@ void FactoryPrivate::phononBackendChange
                 "backendswitching possible.";
             // in case there were objects deleted give 'em a chance to recreate
             // them now
-            for (int i = 0; i < mediaNodePrivateList.count(); ++i) {
-                mediaNodePrivateList.at(i)->createBackendObject();
+            foreach (MediaNodePrivate *bp, mediaNodePrivateList) {
+                bp->createBackendObject();
             }
             return;
         }
@@ -302,8 +277,8 @@ void FactoryPrivate::phononBackendChange
         m_backendObject = 0;
     }
     createBackend();
-    for (int i = 0; i < mediaNodePrivateList.count(); ++i) {
-        mediaNodePrivateList.at(i)->createBackendObject();
+    foreach (MediaNodePrivate *bp, mediaNodePrivateList) {
+        bp->createBackendObject();
     }
     emit backendChanged();
 }
@@ -350,6 +325,7 @@ FACTORY_IMPL(AudioOutput)
 #ifndef QT_NO_PHONON_VIDEO
 FACTORY_IMPL(VideoWidget)
 #endif //QT_NO_PHONON_VIDEO
+FACTORY_IMPL(AudioDataOutput)
 
 #undef FACTORY_IMPL
 
@@ -387,17 +363,15 @@ PlatformPlugin *FactoryPrivate::platform
              QStringList())
             );
     dir.setFilter(QDir::Files);
-    const QStringList libPaths = QCoreApplication::libraryPaths();
     forever {
-        for (int i = 0; i < libPaths.count(); ++i) {
-            const QString libPath = libPaths.at(i) + suffix;
+        foreach (QString libPath, QCoreApplication::libraryPaths()) {
+            libPath += suffix;
             dir.setPath(libPath);
             if (!dir.exists()) {
                 continue;
             }
-            const QStringList files = dir.entryList(QDir::Files);
-            for (int i = 0; i < files.count(); ++i) {
-                QPluginLoader pluginLoader(libPath + files.at(i));
+            foreach (const QString &pluginName, dir.entryList()) {
+                QPluginLoader pluginLoader(libPath + pluginName);
                 if (!pluginLoader.load()) {
                     pDebug() << Q_FUNC_INFO << "  platform plugin load failed:"
                         << pluginLoader.errorString();
@@ -449,7 +423,6 @@ QObject *Factory::backend(bool createWhe
     return globalFactory->m_backendObject;
 }
 
-#ifndef QT_NO_PROPERTIES
 #define GET_STRING_PROPERTY(name) \
 QString Factory::name() \
 { \
@@ -465,11 +438,11 @@ GET_STRING_PROPERTY(backendComment)
 GET_STRING_PROPERTY(backendVersion)
 GET_STRING_PROPERTY(backendIcon)
 GET_STRING_PROPERTY(backendWebsite)
-#endif //QT_NO_PROPERTIES
+
 QObject *Factory::registerQObject(QObject *o)
 {
     if (o) {
-        QObject::connect(o, SIGNAL(destroyed(QObject*)), globalFactory, SLOT(objectDestroyed(QObject*)), Qt::DirectConnection);
+        QObject::connect(o, SIGNAL(destroyed(QObject *)), globalFactory, SLOT(objectDestroyed(QObject *)), Qt::DirectConnection);
         globalFactory->objects.append(o);
     }
     return o;
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/factory_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/factory_p.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/factory_p.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/factory_p.h	2010-02-23 14:47:28.324614754 +0100
@@ -122,6 +122,13 @@ namespace Factory
 #endif //QT_NO_PHONON_VIDEO
 
     /**
+    * Create a new backend object for a AudioDataOutput.
+    *
+    * \return a pointer to the AudioDataOutput the backend provides.
+    */
+    PHONON_EXPORT QObject *createAudioDataOutput(QObject *parent = 0);
+
+    /**
      * \return a pointer to the backend interface.
      */
     PHONON_EXPORT QObject *backend(bool createWhenNull = true);
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/globalconfig.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/globalconfig.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/globalconfig.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/globalconfig.cpp	2010-02-23 14:47:28.324614754 +0100
@@ -20,6 +20,7 @@
 
 */
 
+#include "globalconfig.h"
 #include "globalconfig_p.h"
 
 #include "factory_p.h"
@@ -29,6 +30,7 @@
 #include "backendinterface.h"
 #include "qsettingsgroup_p.h"
 #include "phononnamespace_p.h"
+#include "pulsesupport.h"
 
 #include <QtCore/QList>
 #include <QtCore/QVariant>
@@ -38,15 +40,18 @@ QT_BEGIN_NAMESPACE
 namespace Phonon
 {
 
+GlobalConfigPrivate::GlobalConfigPrivate() : config(QLatin1String("kde.org"), QLatin1String("libphonon"))
+{
+}
+
 GlobalConfig::GlobalConfig()
-#ifndef QT_NO_SETTINGS
-    : m_config(QLatin1String("kde.org"), QLatin1String("libphonon"))
-#endif //QT_NO_SETTINGS
+    : k_ptr(new GlobalConfigPrivate)
 {
 }
 
 GlobalConfig::~GlobalConfig()
 {
+    delete k_ptr;
 }
 
 enum WhatToFilter {
@@ -85,9 +90,12 @@ static void filter(ObjectDescriptionType
     }
 }
 
-#ifndef QT_NO_PHONON_SETTINGSGROUP
-static QList<int> listSortedByConfig(const QSettingsGroup &backendConfig, Phonon::Category category, QList<int> &defaultList)
+static QList<int> sortDevicesByCategoryPriority(const GlobalConfig *config, const QSettingsGroup *backendConfig, ObjectDescriptionType type, Phonon::Category category, QList<int> &defaultList)
 {
+    Q_ASSERT(config);
+    Q_ASSERT(backendConfig);
+    Q_ASSERT(type == AudioOutputDeviceType || type == AudioCaptureDeviceType);
+
     if (defaultList.size() <= 1) {
         // nothing to sort
         return defaultList;
@@ -104,20 +112,26 @@ static QList<int> listSortedByConfig(con
         }
     }
 
-    QString categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(category));
-    if (!backendConfig.hasKey(categoryKey)) {
-        // no list in config for the given category
-        categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(Phonon::NoCategory));
-        if (!backendConfig.hasKey(categoryKey)) {
-            // no list in config for NoCategory
-            return defaultList;
+    QList<int> deviceList;
+    PulseSupport *pulse = PulseSupport::getInstance();
+    if (pulse->isActive()) {
+        deviceList = pulse->objectIndexesByCategory(type, category);
+    } else {
+        QString categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(category));
+        if (!backendConfig->hasKey(categoryKey)) {
+            // no list in config for the given category
+            categoryKey = QLatin1String("Category_") + QString::number(static_cast<int>(Phonon::NoCategory));
+            if (!backendConfig->hasKey(categoryKey)) {
+                // no list in config for NoCategory
+                return defaultList;
+            }
         }
-    }
 
-    //Now the list from m_config
-    QList<int> deviceList = backendConfig.value(categoryKey, QList<int>());
+        //Now the list from d->config
+        deviceList = backendConfig->value(categoryKey, QList<int>());
+    }
 
-    //if there are devices in m_config that the backend doesn't report, remove them from the list
+    //if there are devices in d->config that the backend doesn't report, remove them from the list
     QMutableListIterator<int> i(deviceList);
     while (i.hasNext()) {
         if (0 == defaultList.removeAll(i.next())) {
@@ -125,49 +139,176 @@ static QList<int> listSortedByConfig(con
         }
     }
 
-    //if the backend reports more devices that are not in m_config append them to the list
+    //if the backend reports more devices that are not in d->config append them to the list
     deviceList += defaultList;
 
     return deviceList;
 }
-#endif //QT_NO_PHONON_SETTINGSGROUP
 
-#ifndef QT_NO_PHONON_SETTINGSGROUP
-QList<int> GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, int override) const
+bool GlobalConfig::hideAdvancedDevices() const
 {
+    K_D(const GlobalConfig);
     //The devices need to be stored independently for every backend
-    const QSettingsGroup backendConfig(&m_config, QLatin1String("AudioOutputDevice")); // + Factory::identifier());
-    const QSettingsGroup generalGroup(&m_config, QLatin1String("General"));
-    const bool hideAdvancedDevices = ((override & AdvancedDevicesFromSettings)
-            ? generalGroup.value(QLatin1String("HideAdvancedDevices"), true)
+    const QSettingsGroup generalGroup(&d->config, QLatin1String("General"));
+    return generalGroup.value(QLatin1String("HideAdvancedDevices"), true);
+}
+
+void GlobalConfig::setHideAdvancedDevices(bool hide)
+{
+    K_D(GlobalConfig);
+    QSettingsGroup generalGroup(&d->config, QLatin1String("General"));
+    generalGroup.setValue(QLatin1String("HideAdvancedDevices"), hide);
+}
+
+static bool isHiddenAudioOutputDevice(const GlobalConfig *config, int i)
+{
+    Q_ASSERT(config);
+
+    if (!config->hideAdvancedDevices())
+        return false;
+
+    AudioOutputDevice ad = AudioOutputDevice::fromIndex(i);
+    const QVariant var = ad.property("isAdvanced");
+    return (var.isValid() && var.toBool());
+}
+
+#ifndef QT_NO_PHONON_AUDIOCAPTURE
+static bool isHiddenAudioCaptureDevice(const GlobalConfig *config, int i)
+{
+    Q_ASSERT(config);
+
+    if (!config->hideAdvancedDevices())
+        return false;
+
+    AudioCaptureDevice ad = AudioCaptureDevice::fromIndex(i);
+    const QVariant var = ad.property("isAdvanced");
+    return (var.isValid() && var.toBool());
+}
+#endif
+
+static QList<int> reindexList(const GlobalConfig *config, Phonon::Category category, QList<int>newOrder, bool output)
+{
+    Q_ASSERT(config);
+#ifdef QT_NO_PHONON_AUDIOCAPTURE
+    Q_ASSERT(output);
+#endif
+
+    /*QString sb;
+    sb = QString("(Size %1)").arg(currentList.size());
+    foreach (int i, currentList)
+    sb += QString("%1, ").arg(i);
+    fprintf(stderr, "=== Reindex Current: %s\n", sb.toUtf8().constData());
+    sb = QString("(Size %1)").arg(newOrder.size());
+    foreach (int i, newOrder)
+    sb += QString("%1, ").arg(i);
+    fprintf(stderr, "=== Reindex Before : %s\n", sb.toUtf8().constData());*/
+
+    QList<int> currentList;
+    if (output)
+        currentList = config->audioOutputDeviceListFor(category, GlobalConfig::ShowUnavailableDevices|GlobalConfig::ShowAdvancedDevices);
+#ifndef QT_NO_PHONON_AUDIOCAPTURE
+    else
+        currentList = config->audioCaptureDeviceListFor(category, GlobalConfig::ShowUnavailableDevices|GlobalConfig::ShowAdvancedDevices);
+#endif
+
+    QList<int> newList;
+
+    foreach (int i, newOrder) {
+        int found = currentList.indexOf(i);
+        if (found < 0) {
+            // It's not in the list, so something is odd (e.g. client error). Ignore it.
+            continue;
+        }
+
+        // Iterate through the list from this point onward. If there are hidden devices
+        // immediately following, take them too.
+        newList.append(currentList.takeAt(found));
+        while (found < currentList.size()) {
+            bool hidden = true;
+            if (output)
+                hidden = isHiddenAudioOutputDevice(config, currentList.at(found));
+#ifndef QT_NO_PHONON_AUDIOCAPTURE
+            else
+                hidden = isHiddenAudioCaptureDevice(config, currentList.at(found));
+#endif
+
+            if (!hidden)
+                break;
+            newList.append(currentList.takeAt(found));
+        }
+    }
+
+    // If there are any devices left in.. just tack them on the end.
+    if (currentList.size() > 0)
+        newList += currentList;
+
+    /*sb = QString("(Size %1)").arg(newList.size());
+    foreach (int i, newList)
+    sb += QString("%1, ").arg(i);
+    fprintf(stderr, "=== Reindex After  : %s\n", sb.toUtf8().constData());*/
+    return newList;
+}
+
+
+void GlobalConfig::setAudioOutputDeviceListFor(Phonon::Category category, QList<int> order)
+{
+    PulseSupport *pulse = PulseSupport::getInstance();
+    if (pulse->isActive()) {
+        pulse->setOutputDevicePriorityForCategory(category, order);
+        return;
+    }
+
+    K_D(GlobalConfig);
+    QSettingsGroup backendConfig(&d->config, QLatin1String("AudioOutputDevice")); // + Factory::identifier());
+
+    order = reindexList(this, category, order, true);
+
+    const QList<int> noCategoryOrder = audioOutputDeviceListFor(Phonon::NoCategory, ShowUnavailableDevices|ShowAdvancedDevices);
+    if (category != Phonon::NoCategory && order == noCategoryOrder) {
+        backendConfig.removeEntry(QLatin1String("Category_") + QString::number(category));
+    } else {
+        backendConfig.setValue(QLatin1String("Category_") + QString::number(category), order);
+    }
+}
+
+QList<int> GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, int override) const
+{
+    K_D(const GlobalConfig);
+
+    const bool hide = ((override & AdvancedDevicesFromSettings)
+            ? hideAdvancedDevices()
             : static_cast<bool>(override & HideAdvancedDevices));
 
     QList<int> defaultList;
+    BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend());
+
 #ifndef QT_NO_PHONON_PLATFORMPLUGIN
-    if (PlatformPlugin *platformPlugin = Factory::platformPlugin()) {
-        // the platform plugin lists the audio devices for the platform
-        // this list already is in default order (as defined by the platform plugin)
-        defaultList = platformPlugin->objectDescriptionIndexes(Phonon::AudioOutputDeviceType);
-        if (hideAdvancedDevices) {
-            QMutableListIterator<int> it(defaultList);
-            while (it.hasNext()) {
-                AudioOutputDevice objDesc = AudioOutputDevice::fromIndex(it.next());
-                const QVariant var = objDesc.property("isAdvanced");
-                if (var.isValid() && var.toBool()) {
-                    it.remove();
+    if (!backendIface || !PulseSupport::getInstance()->isActive()) {
+        if (PlatformPlugin *platformPlugin = Factory::platformPlugin()) {
+            // the platform plugin lists the audio devices for the platform
+            // this list already is in default order (as defined by the platform plugin)
+            defaultList = platformPlugin->objectDescriptionIndexes(Phonon::AudioOutputDeviceType);
+            if (hide) {
+                QMutableListIterator<int> it(defaultList);
+                while (it.hasNext()) {
+                    AudioOutputDevice objDesc = AudioOutputDevice::fromIndex(it.next());
+                    const QVariant var = objDesc.property("isAdvanced");
+                    if (var.isValid() && var.toBool()) {
+                        it.remove();
+                    }
                 }
             }
         }
     }
 #endif //QT_NO_PHONON_PLATFORMPLUGIN
 
-    // lookup the available devices directly from the backend (mostly for virtual devices)
-    if (BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend())) {
+    // lookup the available devices directly from the backend
+    if (backendIface) {
         // this list already is in default order (as defined by the backend)
         QList<int> list = backendIface->objectDescriptionIndexes(Phonon::AudioOutputDeviceType);
-        if (hideAdvancedDevices || !defaultList.isEmpty() || (override & HideUnavailableDevices)) {
+        if (hide || !defaultList.isEmpty() || (override & HideUnavailableDevices)) {
             filter(AudioOutputDeviceType, backendIface, &list,
-                    (hideAdvancedDevices ? FilterAdvancedDevices : 0)
+                    (hide ? FilterAdvancedDevices : 0)
                     // the platform plugin already provided the hardware devices
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
@@ -176,56 +317,78 @@ QList<int> GlobalConfig::audioOutputDevi
         defaultList += list;
     }
 
-    return listSortedByConfig(backendConfig, category, defaultList);
+    const QSettingsGroup backendConfig(&d->config, QLatin1String("AudioOutputDevice")); // + Factory::identifier());
+    return sortDevicesByCategoryPriority(this, &backendConfig, AudioOutputDeviceType, category, defaultList);
 }
-#endif //QT_NO_PHONON_SETTINGSGROUP
+
 int GlobalConfig::audioOutputDeviceFor(Phonon::Category category, int override) const
 {
-#ifndef QT_NO_PHONON_SETTINGSGROUP
     QList<int> ret = audioOutputDeviceListFor(category, override);
-    if (!ret.isEmpty())
-        return ret.first();
-#endif //QT_NO_PHONON_SETTINGSGROUP
-    return -1;
+    if (ret.isEmpty())
+        return -1;
+    return ret.first();
 }
 
 #ifndef QT_NO_PHONON_AUDIOCAPTURE
+void GlobalConfig::setAudioCaptureDeviceListFor(Phonon::Category category, QList<int> order)
+{
+    PulseSupport *pulse = PulseSupport::getInstance();
+    if (pulse->isActive()) {
+        pulse->setCaptureDevicePriorityForCategory(category, order);
+        return;
+    }
+
+    K_D(GlobalConfig);
+    QSettingsGroup backendConfig(&d->config, QLatin1String("AudioCaptureDevice")); // + Factory::identifier());
+
+    order = reindexList(this, category, order, false);
+
+    const QList<int> noCategoryOrder = audioCaptureDeviceListFor(Phonon::NoCategory, ShowUnavailableDevices|ShowAdvancedDevices);
+    if (category != Phonon::NoCategory && order == noCategoryOrder) {
+        backendConfig.removeEntry(QLatin1String("Category_") + QString::number(category));
+    } else {
+        backendConfig.setValue(QLatin1String("Category_") + QString::number(category), order);
+    }
+}
+
 QList<int> GlobalConfig::audioCaptureDeviceListFor(Phonon::Category category, int override) const
 {
-#ifndef QT_NO_PHONON_SETTINGSGROUP
-    //The devices need to be stored independently for every backend
-    const QSettingsGroup backendConfig(&m_config, QLatin1String("AudioCaptureDevice")); // + Factory::identifier());
-    const QSettingsGroup generalGroup(&m_config, QLatin1String("General"));
-    const bool hideAdvancedDevices = ((override & AdvancedDevicesFromSettings)
-            ? generalGroup.value(QLatin1String("HideAdvancedDevices"), true)
+    K_D(const GlobalConfig);
+
+    const bool hide = ((override & AdvancedDevicesFromSettings)
+            ? hideAdvancedDevices()
             : static_cast<bool>(override & HideAdvancedDevices));
 
     QList<int> defaultList;
+    BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend());
+
 #ifndef QT_NO_PHONON_PLATFORMPLUGIN
-    if (PlatformPlugin *platformPlugin = Factory::platformPlugin()) {
-        // the platform plugin lists the audio devices for the platform
-        // this list already is in default order (as defined by the platform plugin)
-        defaultList = platformPlugin->objectDescriptionIndexes(Phonon::AudioCaptureDeviceType);
-        if (hideAdvancedDevices) {
-            QMutableListIterator<int> it(defaultList);
-            while (it.hasNext()) {
-                AudioCaptureDevice objDesc = AudioCaptureDevice::fromIndex(it.next());
-                const QVariant var = objDesc.property("isAdvanced");
-                if (var.isValid() && var.toBool()) {
-                    it.remove();
+    if (!backendIface || !PulseSupport::getInstance()->isActive()) {
+        if (PlatformPlugin *platformPlugin = Factory::platformPlugin()) {
+            // the platform plugin lists the audio devices for the platform
+            // this list already is in default order (as defined by the platform plugin)
+            defaultList = platformPlugin->objectDescriptionIndexes(Phonon::AudioCaptureDeviceType);
+            if (hide) {
+                QMutableListIterator<int> it(defaultList);
+                while (it.hasNext()) {
+                    AudioCaptureDevice objDesc = AudioCaptureDevice::fromIndex(it.next());
+                    const QVariant var = objDesc.property("isAdvanced");
+                    if (var.isValid() && var.toBool()) {
+                        it.remove();
+                    }
                 }
             }
         }
     }
 #endif //QT_NO_PHONON_PLATFORMPLUGIN
 
-    // lookup the available devices directly from the backend (mostly for virtual devices)
-    if (BackendInterface *backendIface = qobject_cast<BackendInterface *>(Factory::backend())) {
+    // lookup the available devices directly from the backend
+    if (backendIface) {
         // this list already is in default order (as defined by the backend)
         QList<int> list = backendIface->objectDescriptionIndexes(Phonon::AudioCaptureDeviceType);
-        if (hideAdvancedDevices || !defaultList.isEmpty() || (override & HideUnavailableDevices)) {
+        if (hide || !defaultList.isEmpty() || (override & HideUnavailableDevices)) {
             filter(AudioCaptureDeviceType, backendIface, &list,
-                    (hideAdvancedDevices ? FilterAdvancedDevices : 0)
+                    (hide ? FilterAdvancedDevices : 0)
                     // the platform plugin already provided the hardware devices
                     | (defaultList.isEmpty() ? 0 : FilterHardwareDevices)
                     | ((override & HideUnavailableDevices) ? FilterUnavailableDevices : 0)
@@ -234,10 +397,8 @@ QList<int> GlobalConfig::audioCaptureDev
         defaultList += list;
     }
 
-    return listSortedByConfig(backendConfig, category, defaultList);
-#else //QT_NO_SETTINGSGROUP
-    return QList<int>();
-#endif //QT_NO_SETTINGSGROUP
+    const QSettingsGroup backendConfig(&d->config, QLatin1String("AudioCaptureDevice")); // + Factory::identifier());
+    return sortDevicesByCategoryPriority(this, &backendConfig, AudioCaptureDeviceType, category, defaultList);
 }
 
 int GlobalConfig::audioCaptureDeviceFor(Phonon::Category category, int override) const
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/globalconfig.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/globalconfig.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/globalconfig.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/globalconfig.h	2010-02-23 14:47:28.324614754 +0100
@@ -0,0 +1,71 @@
+/*  This file is part of the KDE project
+Copyright (C) 2006-2008 Matthias Kretz <kretz@kde.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation 
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public 
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef PHONON_GLOBALCONFIG_H
+#define PHONON_GLOBALCONFIG_H
+
+#include "phonon_export.h"
+#include "phononnamespace.h"
+#include "phonondefs.h"
+
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
+namespace Phonon
+{
+    class GlobalConfigPrivate;
+
+    class PHONON_EXPORT GlobalConfig
+    {
+        K_DECLARE_PRIVATE(GlobalConfig)
+    public:
+        GlobalConfig();
+        virtual ~GlobalConfig();
+
+        enum DevicesToHideFlag {
+            ShowUnavailableDevices = 0,
+            ShowAdvancedDevices = 0,
+            HideAdvancedDevices = 1,
+            AdvancedDevicesFromSettings = 2,
+            HideUnavailableDevices = 4
+        };
+        bool hideAdvancedDevices() const;
+        void setHideAdvancedDevices(bool hide = true);
+        void setAudioOutputDeviceListFor(Phonon::Category category, QList<int> order);
+        QList<int> audioOutputDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
+        int audioOutputDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
+
+#ifndef QT_NO_PHONON_AUDIOCAPTURE
+        void setAudioCaptureDeviceListFor(Phonon::Category category, QList<int> order);
+        QList<int> audioCaptureDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
+        int audioCaptureDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
+#endif //QT_NO_PHONON_AUDIOCAPTURE
+
+    protected:
+        GlobalConfigPrivate *const k_ptr;
+    };
+} // namespace Phonon
+
+QT_END_NAMESPACE
+QT_END_HEADER
+
+#endif // PHONON_GLOBALCONFIG_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/globalconfig_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/globalconfig_p.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/globalconfig_p.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/globalconfig_p.h	2010-02-23 14:47:28.324614754 +0100
@@ -26,40 +26,19 @@ Copyright (C) 2006-2008 Matthias Kretz <
 #include <QtCore/QSettings>
 
 #include "phonon_export.h"
-#include "phononnamespace.h"
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace Phonon
 {
-    class PHONON_EXPORT GlobalConfig
+    class GlobalConfigPrivate
     {
-    public:
-        GlobalConfig();
-        virtual ~GlobalConfig();
-
-        enum DevicesToHideFlag {
-            ShowUnavailableDevices = 0,
-            ShowAdvancedDevices = 0,
-            HideAdvancedDevices = 1,
-            AdvancedDevicesFromSettings = 2,
-            HideUnavailableDevices = 4
-        };
-#ifndef QT_NO_PHONON_SETTINGSGROUP
-        QList<int> audioOutputDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
-#endif //QT_NO_PHONON_SETTINGSGROUP
-        int audioOutputDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
-
-#ifndef QT_NO_PHONON_AUDIOCAPTURE
-        QList<int> audioCaptureDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
-        int audioCaptureDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const;
-#endif //QT_NO_PHONON_AUDIOCAPTURE
+        public:
+            GlobalConfigPrivate();
+            virtual ~GlobalConfigPrivate() {}
 
-    protected:
-#ifndef QT_NO_SETTINGS
-        QSettings m_config;
-#endif //QT_NO_SETTINGS
+            QSettings config;
     };
 } // namespace Phonon
 
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/medianode.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/medianode.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/medianode.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/medianode.cpp	2010-02-23 14:47:28.324614754 +0100
@@ -67,8 +67,8 @@ bool MediaNode::isValid() const
 
     MediaNodePrivate::~MediaNodePrivate()
     {
-        for (int i = 0 ; i < handlers.count(); ++i) {
-            handlers.at(i)->phononObjectDestroyed(this);
+        foreach (MediaNodeDestructionHandler *handler, handlers) {
+            handler->phononObjectDestroyed(this);
         }
         Factory::deregisterFrontendObject(this);
         delete m_backendObject;
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/mediaobject.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/mediaobject.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/mediaobject.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/mediaobject.cpp	2010-02-23 14:47:28.324614754 +0100
@@ -300,15 +300,15 @@ void MediaObject::enqueue(const MediaSou
 
 void MediaObject::enqueue(const QList<MediaSource> &sources)
 {
-    for (int i = 0; i < sources.count(); ++i) {
-        enqueue(sources.at(i));
+    foreach (const MediaSource &m, sources) {
+        enqueue(m);
     }
 }
 
 void MediaObject::enqueue(const QList<QUrl> &urls)
 {
-    for (int i = 0; i < urls.count(); ++i) {
-        enqueue(urls.at(i));
+    foreach (const QUrl &url, urls) {
+        enqueue(url);
     }
 }
 
@@ -453,9 +453,9 @@ void MediaObjectPrivate::setupBackendObj
     //pDebug() << Q_FUNC_INFO;
 
 #ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
-    QObject::connect(m_backendObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), q, SLOT(_k_stateChanged(Phonon::State,Phonon::State)));
+    QObject::connect(m_backendObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)), q, SLOT(_k_stateChanged(Phonon::State, Phonon::State)));
 #else
-    QObject::connect(m_backendObject, SIGNAL(stateChanged(Phonon::State,Phonon::State)), q, SIGNAL(stateChanged(Phonon::State,Phonon::State)));
+    QObject::connect(m_backendObject, SIGNAL(stateChanged(Phonon::State, Phonon::State)), q, SIGNAL(stateChanged(Phonon::State, Phonon::State)));
 #endif // QT_NO_PHONON_ABSTRACTMEDIASTREAM
     QObject::connect(m_backendObject, SIGNAL(tick(qint64)),             q, SIGNAL(tick(qint64)));
     QObject::connect(m_backendObject, SIGNAL(seekableChanged(bool)),    q, SIGNAL(seekableChanged(bool)));
@@ -467,10 +467,10 @@ void MediaObjectPrivate::setupBackendObj
     QObject::connect(m_backendObject, SIGNAL(aboutToFinish()),          q, SLOT(_k_aboutToFinish()));
     QObject::connect(m_backendObject, SIGNAL(prefinishMarkReached(qint32)), q, SIGNAL(prefinishMarkReached(qint32)));
     QObject::connect(m_backendObject, SIGNAL(totalTimeChanged(qint64)), q, SIGNAL(totalTimeChanged(qint64)));
-    QObject::connect(m_backendObject, SIGNAL(metaDataChanged(QMultiMap<QString,QString>)),
-            q, SLOT(_k_metaDataChanged(QMultiMap<QString,QString>)));
-    QObject::connect(m_backendObject, SIGNAL(currentSourceChanged(MediaSource)), 
-        q, SLOT(_k_currentSourceChanged(MediaSource)));
+    QObject::connect(m_backendObject, SIGNAL(metaDataChanged(const QMultiMap<QString, QString> &)),
+            q, SLOT(_k_metaDataChanged(const QMultiMap<QString, QString> &)));
+    QObject::connect(m_backendObject, SIGNAL(currentSourceChanged(const MediaSource&)), 
+        q, SLOT(_k_currentSourceChanged(const MediaSource&)));
 
     // set up attributes
     pINTERFACE_CALL(setTickInterval(tickInterval));
@@ -502,8 +502,8 @@ void MediaObjectPrivate::setupBackendObj
     }
 
 #ifndef QT_NO_PHONON_MEDIACONTROLLER
-    for (int i = 0 ; i < interfaceList.count(); ++i) {
-        interfaceList.at(i)->_backendObjectChanged();
+    foreach (FrontendInterfacePrivate *f, interfaceList) {
+        f->_backendObjectChanged();
     }
 #endif //QT_NO_PHONON_MEDIACONTROLLER
 
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/mediaobject.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/mediaobject.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/mediaobject.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/mediaobject.h	2010-02-23 14:47:28.324614754 +0100
@@ -15,7 +15,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Lesser General Public License for more details.
 
-    You should have received a copy of the GNU Lesser General Public
+    You should have received a copy of the GNU Lesser General Public 
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 */
@@ -198,18 +198,18 @@ namespace Phonon
              * Check whether the current media may be seeked.
              *
              * \warning This information cannot be known immediately. It is best
-             * to also listen to the seekableChanged signal.
+             * to also listen to the hasVideoChanged signal.
              *
              * \code
-             *   connect(media, SIGNAL(seekableChanged(bool)), seekableChanged(bool));
+             *   connect(media, SIGNAL(hasVideoChanged(bool)), hasVideoChanged(bool));
              *   media->setCurrentSource("somevideo.avi");
-             *   media->isSeekable(); // returns false;
+             *   media->hasVideo(); // returns false;
              * }
              *
-             * void seekableChanged(bool b)
+             * void hasVideoChanged(bool b)
              * {
              *   // b == true
-             *   media->isSeekable(); // returns true;
+             *   media->hasVideo(); // returns true;
              * }
              * \endcode
              *
@@ -301,7 +301,7 @@ namespace Phonon
             void setCurrentSource(const MediaSource &source);
 
             /**
-             * Returns the queued media sources. This list does not include
+             * Returns the queued media sources. This does list does not include
              * the current source (returned by currentSource).
              */
             QList<MediaSource> queue() const;
@@ -456,6 +456,8 @@ namespace Phonon
         Q_SIGNALS:
             /**
              * Emitted when the state of the MediaObject has changed.
+             * In case you're not interested in the old state you can also
+             * connect to a slot that only has one State argument.
              *
              * @param newstate The state the Player is in now.
              * @param oldstate The state the Player was in before.
@@ -585,7 +587,7 @@ namespace Phonon
             /**
              * This signal is emitted as soon as the total time of the media file is
              * known or has changed. For most non-local media data the total
-             * time of the media can only be known after some time. Initially the
+             * time of the media can only be known after some time. At that time the
              * totalTime function can not return useful information. You have
              * to wait for this signal to know the real total time.
              *
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/mediasource.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/mediasource.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/mediasource.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/mediasource.cpp	2010-02-23 14:47:28.328634075 +0100
@@ -140,12 +140,8 @@ MediaSourcePrivate::~MediaSourcePrivate(
 {
 #ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
     if (autoDelete) {
-        //here we use deleteLater because this object
-        //might be destroyed from another thread
-        if (stream)
-            stream->deleteLater();
-        if (ioDevice)
-            ioDevice->deleteLater();
+        delete stream;
+        delete ioDevice;
     }
 #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
 }
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/objectdescription.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/objectdescription.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/objectdescription.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/objectdescription.cpp	2010-02-23 14:47:28.328634075 +0100
@@ -29,6 +29,7 @@
 #include <QtCore/QStringList>
 #include "backendinterface.h"
 #include "platformplugin.h"
+#include "pulsesupport.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -108,22 +109,24 @@ bool ObjectDescriptionData::isValid() co
 
 ObjectDescriptionData *ObjectDescriptionData::fromIndex(ObjectDescriptionType type, int index)
 {
+    BackendInterface *iface = qobject_cast<BackendInterface *>(Factory::backend());
+
     // prefer to get the ObjectDescriptionData from the platform plugin for audio devices
 #ifndef QT_NO_PHONON_PLATFORMPLUGIN
-    if (type == AudioOutputDeviceType || type == AudioCaptureDeviceType) {
-        PlatformPlugin *platformPlugin = Factory::platformPlugin();
-        if (platformPlugin) {
-            QList<int> indexes = platformPlugin->objectDescriptionIndexes(type);
-            if (indexes.contains(index)) {
-                QHash<QByteArray, QVariant> properties = platformPlugin->objectDescriptionProperties(type, index);
-                return new ObjectDescriptionData(index, properties);
+    if (!iface || !PulseSupport::getInstance()->isActive()) {
+        if (type == AudioOutputDeviceType || type == AudioCaptureDeviceType) {
+            PlatformPlugin *platformPlugin = Factory::platformPlugin();
+            if (platformPlugin) {
+                QList<int> indexes = platformPlugin->objectDescriptionIndexes(type);
+                if (indexes.contains(index)) {
+                    QHash<QByteArray, QVariant> properties = platformPlugin->objectDescriptionProperties(type, index);
+                    return new ObjectDescriptionData(index, properties);
+                }
             }
         }
     }
 #endif //QT_NO_PHONON_PLATFORMPLUGIN
 
-    QObject *b = Factory::backend();
-    BackendInterface *iface = qobject_cast<BackendInterface *>(b);
     if (iface) {
         QList<int> indexes = iface->objectDescriptionIndexes(type);
         if (indexes.contains(index)) {
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/objectdescriptionmodel.cpp	2010-02-23 14:47:28.328634075 +0100
@@ -67,8 +67,6 @@ static const char qt_meta_stringdata_Pho
 namespace Phonon
 {
 
-#if !defined(Q_CC_MINGW) || __MINGW32_MAJOR_VERSION >= 4
-
 template<> const QMetaObject ObjectDescriptionModel<AudioOutputDeviceType>::staticMetaObject = {
     { &QAbstractListModel::staticMetaObject, qt_meta_stringdata_Phonon__ObjectDescriptionModel_AudioOutputDeviceType,
       qt_meta_data_Phonon__ObjectDescriptionModel, 0 }
@@ -139,7 +137,6 @@ int ObjectDescriptionModel<type>::qt_met
     return QAbstractListModel::qt_metacall(_c, _id, _a);
 }
 */
-#endif
 
 int ObjectDescriptionModelData::rowCount(const QModelIndex &parent) const
 {
@@ -321,8 +318,8 @@ bool ObjectDescriptionModelData::dropMim
         }
     }
     d->model->beginInsertRows(QModelIndex(), row, row + toInsert.size() - 1);
-    for (int i = 0 ; i < toInsert.count(); ++i) {
-        d->data.insert(row, toInsert.at(i));
+    foreach (const QExplicitlySharedDataPointer<ObjectDescriptionData> &obj, toInsert) {
+        d->data.insert(row, obj);
     }
     d->model->endInsertRows();
     return true;
@@ -365,8 +362,7 @@ QStringList ObjectDescriptionModelData::
     return QStringList(QLatin1String("application/x-phonon-objectdescription") + QString::number(static_cast<int>(type)));
 }
 
-#if !defined(Q_CC_MINGW) || __MINGW32_MAJOR_VERSION >= 4
-#if !defined(Q_CC_MSVC) || _MSC_VER > 1300 || defined(Q_CC_INTEL)
+#if !defined(Q_CC_MSVC) || _MSC_VER > 1300 || defined(Q_CC_INTEL) || defined(Q_CC_MINGW)
 #define INSTANTIATE_META_FUNCTIONS(type) \
 template const QMetaObject *ObjectDescriptionModel<type>::metaObject() const; \
 template void *ObjectDescriptionModel<type>::qt_metacast(const char *)
@@ -384,7 +380,6 @@ INSTANTIATE_META_FUNCTIONS(VideoCodecTyp
 INSTANTIATE_META_FUNCTIONS(ContainerFormatType);
 INSTANTIATE_META_FUNCTIONS(VisualizationType);
 */
-#endif //Q_CC_MINGW
 } // namespace Phonon
 
 #endif //QT_NO_PHONON_OBJECTDESCRIPTIONMODEL
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/objectdescriptionmodel.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/objectdescriptionmodel.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/objectdescriptionmodel.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/objectdescriptionmodel.h	2010-02-23 14:47:28.328634075 +0100
@@ -35,6 +35,18 @@ QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_PHONON_OBJECTDESCRIPTIONMODEL
 
+/* MinGW 3.4.x gives an ICE when trying to instantiate one of the
+   ObjectDescriptionModel<foo> classes because it can't handle
+   half exported classes correct. gcc 4.3.x has a fix for this but
+   we currently there's no official gcc 4.3 on windows available.
+   Because of this we need this little hack
+ */
+#if defined(Q_CC_MINGW)
+#define PHONON_EXPORT_ODM
+#else
+#define PHONON_EXPORT_ODM  PHONON_EXPORT
+#endif
+
 namespace Phonon
 {
     class ObjectDescriptionModelDataPrivate;
@@ -139,21 +151,6 @@ namespace Phonon
             ObjectDescriptionModelDataPrivate *const d;
     };
 
-/* Required to ensure template class vtables are exported on both symbian
-and existing builds. */
-#if defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT)
-// RVCT compiler (2.2.686) requires the export declaration to be on the class to export vtables
-// MWC compiler works both ways
-// GCCE compiler is unknown (it can't compile QtCore yet)
-#define PHONON_TEMPLATE_CLASS_EXPORT PHONON_EXPORT
-#define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT
-#else
-// Windows builds (at least) do not support export declaration on templated class
-// But if you export a member function, the vtable is implicitly exported
-#define PHONON_TEMPLATE_CLASS_EXPORT
-#define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT PHONON_EXPORT
-#endif
-
     /** \class ObjectDescriptionModel objectdescriptionmodel.h Phonon/ObjectDescriptionModel
      * \short The ObjectDescriptionModel class provides a model from
      * a list of ObjectDescription objects.
@@ -190,26 +187,17 @@ and existing builds. */
      * \author Matthias Kretz <kretz@kde.org>
      */
     template<ObjectDescriptionType type>
-    class PHONON_TEMPLATE_CLASS_EXPORT ObjectDescriptionModel : public QAbstractListModel
+    class ObjectDescriptionModel : public QAbstractListModel
     {
         public:
             Q_OBJECT_CHECK
-
-/* MinGW 3.4.x gives an ICE when trying to instantiate one of the
-   ObjectDescriptionModel<foo> classes because it can't handle
-   half exported classes correct. gcc 4.3.x has a fix for this but
-   we currently there's no official gcc 4.3 on windows available.
-   Because of this we need this little hack
- */
-#if !defined(Q_CC_MINGW) || __MINGW32_MAJOR_VERSION >= 4
             /** \internal */
-            static PHONON_TEMPLATE_CLASS_MEMBER_EXPORT const QMetaObject staticMetaObject;
+            static PHONON_EXPORT const QMetaObject staticMetaObject;
             /** \internal */
-            PHONON_TEMPLATE_CLASS_MEMBER_EXPORT const QMetaObject *metaObject() const;
+            PHONON_EXPORT_ODM const QMetaObject *metaObject() const;
             /** \internal */
-            PHONON_TEMPLATE_CLASS_MEMBER_EXPORT void *qt_metacast(const char *_clname);
+            PHONON_EXPORT_ODM void *qt_metacast(const char *_clname);
             //int qt_metacall(QMetaObject::Call _c, int _id, void **_a);
-#endif
 
             /**
              * Returns the number of rows in the model. This value corresponds
@@ -307,8 +295,8 @@ and existing builds. */
              */
             inline void setModelData(const QList<ObjectDescription<type> > &data) { //krazy:exclude=inline
                 QList<QExplicitlySharedDataPointer<ObjectDescriptionData> > list;
-                for (int i = 0; i < data.count(); ++i) {
-                    list += data.at(i).d;
+                Q_FOREACH (const ObjectDescription<type> &desc, data) {
+                    list << desc.d;
                 }
                 d->setModelData(list);
             }
@@ -322,8 +310,8 @@ and existing builds. */
             inline QList<ObjectDescription<type> > modelData() const { //krazy:exclude=inline
                 QList<ObjectDescription<type> > ret;
                 QList<QExplicitlySharedDataPointer<ObjectDescriptionData> > list = d->modelData();
-                for (int i = 0; i < list.count(); ++i) {
-                    ret << ObjectDescription<type>(list.at(i));
+                Q_FOREACH (const QExplicitlySharedDataPointer<ObjectDescriptionData> &data, list) {
+                    ret << ObjectDescription<type>(data);
                 }
                 return ret;
             }
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/path.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/path.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/path.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/path.cpp	2010-02-23 14:47:28.328634075 +0100
@@ -58,8 +58,8 @@ class ConnectionTransaction
 PathPrivate::~PathPrivate()
 {
 #ifndef QT_NO_PHONON_EFFECT
-    for (int i = 0; i < effects.count(); ++i) {
-        effects.at(i)->k_ptr->removeDestructionHandler(this);
+    foreach (Effect *e, effects) {
+        e->k_ptr->removeDestructionHandler(this);
     }
     delete effectsParent;
 #endif
@@ -233,8 +233,8 @@ bool Path::disconnect()
     if (d->sourceNode)
         list << d->sourceNode->k_ptr->backendObject();
 #ifndef QT_NO_PHONON_EFFECT
-    for (int i = 0; i < d->effects.count(); ++i) {
-        list << d->effects.at(i)->k_ptr->backendObject();
+    foreach(Effect *e, d->effects) {
+        list << e->k_ptr->backendObject();
     }
 #endif
     if (d->sinkNode) {
@@ -260,8 +260,8 @@ bool Path::disconnect()
         d->sourceNode = 0;
 
 #ifndef QT_NO_PHONON_EFFECT
-        for (int i = 0; i < d->effects.count(); ++i) {
-            d->effects.at(i)->k_ptr->removeDestructionHandler(d.data());
+        foreach(Effect *e, d->effects) {
+            e->k_ptr->removeDestructionHandler(d.data());
         }
         d->effects.clear();
 #endif 
@@ -292,13 +292,11 @@ MediaNode *Path::sink() const
 bool PathPrivate::executeTransaction( const QList<QObjectPair> &disconnections, const QList<QObjectPair> &connections)
 {
     QSet<QObject*> nodesForTransaction;
-    for (int i = 0; i < disconnections.count(); ++i) {
-        const QObjectPair &pair = disconnections.at(i);
+    foreach(const QObjectPair &pair, disconnections) {
         nodesForTransaction << pair.first;
         nodesForTransaction << pair.second;
     }
-    for (int i = 0; i < connections.count(); ++i) {
-        const QObjectPair &pair = connections.at(i);
+    foreach(const QObjectPair &pair, connections) {
         nodesForTransaction << pair.first;
         nodesForTransaction << pair.second;
     }
@@ -310,8 +308,8 @@ bool PathPrivate::executeTransaction( co
     if (!transaction)
         return false;
 
-    QList<QObjectPair>::const_iterator it = disconnections.constBegin();
-    for(;it != disconnections.constEnd();++it) {
+    QList<QObjectPair>::const_iterator it = disconnections.begin();
+    for(;it != disconnections.end();++it) {
         const QObjectPair &pair = *it;
         if (!backend->disconnectNodes(pair.first, pair.second)) {
 
@@ -327,8 +325,8 @@ bool PathPrivate::executeTransaction( co
         }
     }
 
-    for(it = connections.constBegin(); it != connections.constEnd(); ++it) {
-        const QObjectPair pair = *it;
+    for(it = connections.begin(); it != connections.end();++it) {
+        const QObjectPair &pair = *it;
         if (!backend->connectNodes(pair.first, pair.second)) {
             //Error: a connection failed
             QList<QObjectPair>::const_iterator it2 = connections.begin();
@@ -340,8 +338,7 @@ bool PathPrivate::executeTransaction( co
             }
 
             //and now let's reconnect the nodes that were disconnected: rollback
-            for (int i = 0; i < disconnections.count(); ++i) {
-                const QObjectPair &pair = disconnections.at(i);
+            foreach(const QObjectPair &pair, disconnections) {
                 bool success = backend->connectNodes(pair.first, pair.second);
                 Q_ASSERT(success); //a failure here means it is impossible to reestablish the connection
                 Q_UNUSED(success);
@@ -420,8 +417,7 @@ void PathPrivate::phononObjectDestroyed(
         sinkNode = 0;
     } else {
 #ifndef QT_NO_PHONON_EFFECT
-        for (int i = 0; i < effects.count(); ++i) {
-            Effect *e = effects.at(i);
+        foreach (Effect *e, effects) {
             if (e->k_ptr == mediaNodePrivate) {
                 removeEffect(e);
             }
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/phonondefs.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/phonondefs.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/phonondefs.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/phonondefs.h	2010-02-23 14:47:28.328634075 +0100
@@ -29,6 +29,11 @@
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
+#ifdef PHONON_BACKEND_VERSION_4_4
+# ifndef PHONON_BACKEND_VERSION_4_3
+#  define PHONON_BACKEND_VERSION_4_3
+# endif
+#endif
 #ifdef PHONON_BACKEND_VERSION_4_3
 # ifndef PHONON_BACKEND_VERSION_4_2
 #  define PHONON_BACKEND_VERSION_4_2
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/phononnamespace.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/phononnamespace.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/phononnamespace.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/phononnamespace.h	2010-02-23 14:47:28.328634075 +0100
@@ -41,12 +41,12 @@
 /**
  * PHONON_VERSION is (major << 16) + (minor << 8) + patch.
  */
-#define PHONON_VERSION PHONON_VERSION_CHECK(4, 3, 1)
+#define PHONON_VERSION PHONON_VERSION_CHECK(4, 3, 80)
 
 /**
  * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1"
  */
-#define PHONON_VERSION_STR "4.3.1"
+#define PHONON_VERSION_STR "4.3.80"
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/phononnamespace.h.in qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/phononnamespace.h.in
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/phononnamespace.h.in	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/phononnamespace.h.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,306 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright (C) 2005-2008 Matthias Kretz <kretz@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) version 3, or any
-    later version accepted by the membership of KDE e.V. (or its
-    successor approved by the membership of KDE e.V.), Nokia Corporation 
-    (or its successors, if any) and the KDE Free Qt Foundation, which shall
-    act as a proxy defined in Section 6 of version 3 of the license.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public 
-    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef PHONONNAMESPACE_H
-#define PHONONNAMESPACE_H
-
-#include "phonon_export.h"
-
-/**
- * Helper macro that can be used like
- * \code
- * #if (PHONON_VERSION >= PHONON_VERSION_CHECK(4, 4, 0))
- * \endcode
- */
-#define PHONON_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
-
-/**
- * PHONON_VERSION is (major << 16) + (minor << 8) + patch.
- */
-#define PHONON_VERSION PHONON_VERSION_CHECK(@PHONON_LIB_MAJOR_VERSION@, @PHONON_LIB_MINOR_VERSION@, @PHONON_LIB_PATCH_VERSION@)
-
-/**
- * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1"
- */
-#define PHONON_VERSION_STR "@PHONON_LIB_MAJOR_VERSION@.@PHONON_LIB_MINOR_VERSION@.@PHONON_LIB_PATCH_VERSION@"
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-class QString;
-
-/**
- * \brief The %KDE Multimedia classes
- *
- * In this Namespace you find the classes to access Multimedia functions for
- * audio and video playback. Those classes are not dependent
- * on any specific framework (like they were in pre KDE4 times) but rather use
- * exchangeable backends to do the work.
- *
- * If you want to write a new backend take a look at \ref phonon_backend_development_page.
- *
- * \author Matthias Kretz <kretz@kde.org>
- */
-namespace Phonon
-{
-    PHONON_EXPORT const char *phononVersion();
-
-    /**
-     * Enum to identify the media discs supported by MediaObject.
-     *
-     * \see MediaSource(Phonon::DiscType, const QString &deviceName)
-     */
-    enum DiscType {
-        /**
-         * No disc was selected. This is only useful as a return value from
-         * MediaSource::distType();
-         */
-        NoDisc = -1,
-        /**
-         * Identifies Audio CDs.
-         */
-        Cd = 0,
-        /**
-         * Identifies DVDs (not arbitrary data DVDs, only movie DVDs).
-         */
-        Dvd = 1,
-        /**
-         * Identifies Video CDs.
-         */
-        Vcd = 2
-    };
-
-    /**
-     * Provided as keys for MediaObject::metaData for convenience, in addition to the strings defined in
-     * the Ogg Vorbis specification.
-     */
-    enum MetaData {
-        /**
-         * The artist generally considered responsible for the work. In popular
-         * music this is usually the performing band or singer. For classical
-         * music it would be the composer. For an audio book it would be the
-         * author of the original text.
-         */
-        ArtistMetaData,
-        /**
-         * The collection name to which this track belongs.
-         */
-        AlbumMetaData,
-        /**
-         * Track/Work name
-         */
-        TitleMetaData,
-        /**
-         * Date the track was recorded
-         */
-        DateMetaData,
-        /**
-         * A short text indication of music genre
-         */
-        GenreMetaData,
-        /**
-         * The track number of this piece if part of a specific larger
-         * collection or album
-         */
-        TracknumberMetaData,
-        /**
-         * A short text description of the contents
-         */
-        DescriptionMetaData,
-        MusicBrainzDiscIdMetaData
-    };
-
-    /**
-     * The state the media producing object is in at the moment.
-     *
-     * \see MediaObject
-     */
-    enum State
-    {
-        /**
-         * After construction it might take a while before the Player is
-         * ready to play(). Normally this doesn't happen for local
-         * files, but can happen for remote files where the asynchronous
-         * mimetype detection and prebuffering can take a while.
-         */
-        LoadingState,
-        /**
-         * The Player has a valid media file loaded and is ready for
-         * playing.
-         */
-        StoppedState,
-        /**
-         * The Player is playing a media file.
-         */
-        PlayingState,
-        /**
-         * The Player is waiting for data to be able to continue
-         * playing.
-         */
-        BufferingState,
-        /**
-         * The Player is currently paused.
-         */
-        PausedState,
-        /**
-         * An unrecoverable error occurred. The Object is unusable in this state.
-         */
-        ErrorState
-    };
-
-    /**
-     * Set's the category your program should be listed in in the mixer.
-     *
-     * A Jukebox will set this to Music, a VoIP program to Communication, a
-     * DVD player to video, and so on.
-     *
-     * \note These categories can also become useful for an application that
-     * controls the volumes automatically, like turning down the music when a call
-     * comes in, or turning down the notifications when the media player knows
-     * it's playing classical music.
-     *
-     * \see AudioOutput::setCategory
-     */
-    enum Category
-    {
-        /**
-         * Will make use of the default device.
-         */
-        NoCategory = -1,
-        /**
-         * If the sounds produced are notifications (bing, beep and such) you
-         * should use this category.
-         */
-        NotificationCategory = 0,
-        /**
-         * If your application is a music player (like a jukebox or media player
-         * playing an audio file).
-         */
-        MusicCategory = 1,
-        /**
-         * If the sound is the audio channel of a video.
-         */
-        VideoCategory = 2,
-        /**
-         * If your applications produces sounds from communication with somebody
-         * else (VoIP, voice chat).
-         */
-        CommunicationCategory = 3,
-        /**
-         * Sound produced by a computer game should go into this category.
-         */
-        GameCategory = 4,
-        /**
-         * Sounds produced for accessibility (e.g. Text-To-Speech)
-         */
-        AccessibilityCategory = 5,
-        /**
-         * \internal
-         * Holds the largest value of categories.
-         */
-        LastCategory = AccessibilityCategory
-    };
-
-    /**
-     * Tells your program how to recover from an error.
-     *
-     * \see MediaObject::errorType()
-     */
-    enum ErrorType {
-        /**
-         * No error. MediaObject::errorType() returns this if
-         * MediaObject::state() != Phonon::ErrorState.
-         */
-        NoError = 0,
-        /**
-         * Playback should work, and trying with another URL should work.
-         */
-        NormalError = 1,
-        /**
-         * Something important does not work. Your program cannot continue
-         * playback or capture or whatever it was trying to do
-         * without help from the user.
-         */
-        FatalError = 2
-    };
-
-    /**
-     * Returns a (translated) string to show to the user identifying the given
-     * Category.
-     */
-    PHONON_EXPORT QString categoryToString(Category c);
-
-    // TODO: naming
-    /*enum MediaStreamType {
-        Audio = 1,
-        Video = 2,
-        StillImage = 4,
-        Subtitle = 8,
-        AllMedia = 0xFFFFFFFF
-    };
-    Q_DECLARE_FLAGS(MediaStreamTypes, MediaStreamType)*/
-} // namespace Phonon
-//Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::MediaStreamTypes)
-
-QT_END_NAMESPACE
-
-//X class kdbgstream;
-//X #include <kdebug.h>
-//X /**
-//X  * Implements needed operator to use Phonon::State with kDebug
-//X  */
-//X inline PHONON_EXPORT kdbgstream &operator<<(kdbgstream  & stream, const Phonon::State state)
-//X {
-//X     switch(state)
-//X     {
-//X     case Phonon::ErrorState:
-//X         stream << "ErrorState";
-//X         break;
-//X     case Phonon::LoadingState:
-//X         stream << "LoadingState";
-//X         break;
-//X     case Phonon::StoppedState:
-//X         stream << "StoppedState";
-//X         break;
-//X     case Phonon::PlayingState:
-//X         stream << "PlayingState";
-//X         break;
-//X     case Phonon::BufferingState:
-//X         stream << "BufferingState";
-//X         break;
-//X     case Phonon::PausedState:
-//X         stream << "PausedState";
-//X         break;
-//X     }
-//X     return stream;
-//X }
-
-#include <QtCore/QMetaType>
-
-Q_DECLARE_METATYPE(Phonon::State)
-Q_DECLARE_METATYPE(Phonon::ErrorType)
-Q_DECLARE_METATYPE(Phonon::Category)
-
-QT_END_HEADER
-
-// vim: sw=4 ts=4 tw=80
-#endif // PHONONNAMESPACE_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/pulsesupport.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/pulsesupport.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/pulsesupport.cpp	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/pulsesupport.cpp	2010-02-23 14:47:28.340633635 +0100
@@ -0,0 +1,966 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2009 Colin Guthrie <cguthrie@mandriva.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include <QtCore/QtGlobal>
+#include <QtCore/QEventLoop>
+#include <QtCore/QDebug>
+#include <QtCore/QStringList>
+
+#ifdef HAVE_PULSEAUDIO
+#include <glib.h>
+#include <pulse/pulseaudio.h>
+#include <pulse/xmalloc.h>
+#include <pulse/glib-mainloop.h>
+#include <pulse/ext-device-manager.h>
+#endif // HAVE_PULSEAUDIO
+
+#include "pulsesupport.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace Phonon
+{
+
+static PulseSupport* s_instance = NULL;
+
+#ifdef HAVE_PULSEAUDIO
+/***
+* Prints a conditional debug message based on the current debug level
+* If obj is provided, classname and objectname will be printed as well
+*
+* see debugLevel()
+*/
+
+static int debugLevel() {
+    static int level = -1;
+    if (level < 1) {
+        level = 0;
+        QString pulseenv = qgetenv("PHONON_PULSEAUDIO_DEBUG");
+        int l = pulseenv.toInt();
+        if (l > 0)
+            level = (l > 2 ? 2 : l);
+    }
+    return level;
+}
+
+static void logMessage(const QString &message, int priority = 2, QObject *obj=0);
+static void logMessage(const QString &message, int priority, QObject *obj)
+{
+    if (debugLevel() > 0) {
+        QString output;
+        if (obj) {
+            // Strip away namespace from className
+            QString className(obj->metaObject()->className());
+            int nameLength = className.length() - className.lastIndexOf(':') - 1;
+            className = className.right(nameLength);
+            output.sprintf("%s %s (%s %p)", message.toLatin1().constData(), 
+                           obj->objectName().toLatin1().constData(), 
+                           className.toLatin1().constData(), obj);
+        }
+        else {
+            output = message;
+        }
+        if (priority <= debugLevel()) {
+            qDebug() << QString("PulseSupport(%1): %2").arg(priority).arg(output);
+        }
+    }
+}
+
+
+class AudioDevice
+{
+    public:
+        inline
+        AudioDevice(QString name, QString desc, QString icon, uint32_t index)
+        : pulseName(name), pulseIndex(index)
+        {
+            properties["name"] = desc;
+            properties["description"] = ""; // We don't have descriptions (well we do, but we use them as the name!)
+            properties["icon"] = icon;
+            properties["available"] = (index != PA_INVALID_INDEX);
+            properties["isAdvanced"] = false; // Nothing is advanced!
+        }
+
+        // Needed for QMap
+        inline AudioDevice() {}
+
+        QString pulseName;
+        uint32_t pulseIndex;
+        QHash<QByteArray, QVariant> properties;
+};
+bool operator!=(const AudioDevice &a, const AudioDevice &b)
+{
+    return !(a.pulseName == b.pulseName && a.properties == b.properties);
+}
+
+class PulseUserData
+{
+    public:
+        inline 
+        PulseUserData()
+        {
+        }
+
+        QMap<QString, AudioDevice> newOutputDevices;
+        QMap<Phonon::Category, QMap<int, int> > newOutputDevicePriorities; // prio, device
+
+        QMap<QString, AudioDevice> newCaptureDevices;
+        QMap<Phonon::Category, QMap<int, int> > newCaptureDevicePriorities; // prio, device
+};
+
+static QMap<QString, Phonon::Category> s_roleCategoryMap;
+
+static bool s_pulseActive = false;
+
+static pa_glib_mainloop *s_mainloop = NULL;
+static pa_context *s_context = NULL;
+static QEventLoop *s_connectionEventloop = NULL;
+
+
+
+static int s_deviceIndexCounter = 0;
+
+static QMap<QString, int> s_outputDeviceIndexes;
+static QMap<int, AudioDevice> s_outputDevices;
+static QMap<Phonon::Category, QMap<int, int> > s_outputDevicePriorities; // prio, device
+static QMap<QString, uint32_t> s_outputStreamIndexMap;
+static QMap<QString, int> s_outputStreamMoveQueue;
+
+static QMap<QString, int> s_captureDeviceIndexes;
+static QMap<int, AudioDevice> s_captureDevices;
+static QMap<Phonon::Category, QMap<int, int> > s_captureDevicePriorities; // prio, device
+static QMap<QString, uint32_t> s_captureStreamIndexMap;
+static QMap<QString, int> s_captureStreamMoveQueue;
+
+
+static void ext_device_manager_subscribe_cb(pa_context *, void *);
+static void ext_device_manager_read_cb(pa_context *c, const pa_ext_device_manager_info *info, int eol, void *userdata) {
+    Q_ASSERT(c);
+    Q_ASSERT(userdata);
+
+    // If this is our first iteration, set things up properly
+    if (s_connectionEventloop) {
+        s_connectionEventloop->exit(0);
+        s_connectionEventloop = NULL;
+        s_pulseActive = true;
+
+        pa_operation *o;
+        pa_ext_device_manager_set_subscribe_cb(c, ext_device_manager_subscribe_cb, NULL);
+        if ((o = pa_ext_device_manager_subscribe(c, 1, NULL, NULL)))
+            pa_operation_unref(o);
+    }
+
+    if (eol < 0) {
+        logMessage(QString("Failed to initialize device manager extension: %1").arg(pa_strerror(pa_context_errno(c))));
+        // OK so we don't have the device manager extension, but we can show a single device and fake it.
+        int index;
+        s_outputDeviceIndexes.clear();
+        s_outputDevices.clear();
+        s_outputDevicePriorities.clear();
+        index = s_deviceIndexCounter++;
+        s_outputDeviceIndexes.insert("sink:default", index);
+        s_outputDevices.insert(index, AudioDevice("sink:default", QObject::tr("PulseAudio Sound Server").toUtf8(), "audio-backend-pulseaudio", 0));
+        for (int i = Phonon::NoCategory; i <= Phonon::LastCategory; ++i) {
+            Phonon::Category cat = static_cast<Phonon::Category>(i);
+            s_outputDevicePriorities[cat].insert(0, index);
+        }
+
+        s_captureDeviceIndexes.clear();
+        s_captureDevices.clear();
+        s_captureDevicePriorities.clear();
+        index = s_deviceIndexCounter++;
+        s_captureDeviceIndexes.insert("source:default", index);
+        s_captureDevices.insert(index, AudioDevice("source:default", QObject::tr("PulseAudio Sound Server").toUtf8(), "audio-backend-pulseaudio", 0));
+        for (int i = Phonon::NoCategory; i <= Phonon::LastCategory; ++i) {
+            Phonon::Category cat = static_cast<Phonon::Category>(i);
+            s_captureDevicePriorities[cat].insert(0, index);
+        }
+
+        return;
+    }
+
+    PulseUserData *u = reinterpret_cast<PulseUserData*>(userdata);
+    if (eol) {
+        // We're done reading the data, so order it by priority and copy it into the
+        // static variables where it can then be accessed by those classes that need it.
+
+        QMap<QString, AudioDevice>::iterator newdev_it;
+
+        // Check for new output devices or things changing about known output devices.
+        bool output_changed = false;
+        for (newdev_it = u->newOutputDevices.begin(); newdev_it != u->newOutputDevices.end(); ++newdev_it) {
+            QString name = newdev_it.key();
+
+            // The name + index map is always written when a new device is added.
+            Q_ASSERT(s_outputDeviceIndexes.contains(name));
+
+            int index = s_outputDeviceIndexes[name];
+            if (!s_outputDevices.contains(index)) {
+                // This is a totally new device
+                output_changed = true;
+                logMessage(QString("Brand New Output Device Found."));
+                s_outputDevices.insert(index, *newdev_it);
+            } else  if (s_outputDevices[index] != *newdev_it) {
+                // We have this device already, but is it different?
+                output_changed = true;
+                logMessage(QString("Change to Existing Output Device (may be Added/Removed or something else)"));
+                s_outputDevices.remove(index);
+                s_outputDevices.insert(index, *newdev_it);
+            }
+        }
+        // Go through the output devices we know about and see if any are no longer mentioned in the list.
+        QMutableMapIterator<QString, int> output_existing_it(s_outputDeviceIndexes);
+        while (output_existing_it.hasNext()) {
+            output_existing_it.next();
+            if (!u->newOutputDevices.contains(output_existing_it.key())) {
+                output_changed = true;
+                logMessage(QString("Output Device Completely Removed"));
+                s_outputDevices.remove(output_existing_it.value());
+                output_existing_it.remove();
+            }
+        }
+
+        // Check for new capture devices or things changing about known capture devices.
+        bool capture_changed = false;
+        for (newdev_it = u->newCaptureDevices.begin(); newdev_it != u->newCaptureDevices.end(); ++newdev_it) {
+            QString name = newdev_it.key();
+
+            // The name + index map is always written when a new device is added.
+            Q_ASSERT(s_captureDeviceIndexes.contains(name));
+
+            int index = s_captureDeviceIndexes[name];
+            if (!s_captureDevices.contains(index)) {
+                // This is a totally new device
+                capture_changed = true;
+                logMessage(QString("Brand New Capture Device Found."));
+                s_captureDevices.insert(index, *newdev_it);
+            } else  if (s_captureDevices[index] != *newdev_it) {
+                // We have this device already, but is it different?
+                capture_changed = true;
+                logMessage(QString("Change to Existing Capture Device (may be Added/Removed or something else)"));
+                s_captureDevices.remove(index);
+                s_captureDevices.insert(index, *newdev_it);
+            }
+        }
+        // Go through the capture devices we know about and see if any are no longer mentioned in the list.
+        QMutableMapIterator<QString, int> capture_existing_it(s_captureDeviceIndexes);
+        while (capture_existing_it.hasNext()) {
+            capture_existing_it.next();
+            if (!u->newCaptureDevices.contains(capture_existing_it.key())) {
+                capture_changed = true;
+                logMessage(QString("Capture Device Completely Removed"));
+                s_captureDevices.remove(capture_existing_it.value());
+                capture_existing_it.remove();
+            }
+        }
+
+        // Just copy accross the new priority lists as we know they are valid
+        if (s_outputDevicePriorities != u->newOutputDevicePriorities) {
+            output_changed = true;
+            s_outputDevicePriorities = u->newOutputDevicePriorities;
+        }
+        if (s_captureDevicePriorities != u->newCaptureDevicePriorities) {
+            capture_changed = true;
+            s_captureDevicePriorities = u->newCaptureDevicePriorities;
+        }
+
+        if (s_instance) {
+            if (output_changed)
+                s_instance->emitObjectDescriptionChanged(AudioOutputDeviceType);
+            if (capture_changed)
+                s_instance->emitObjectDescriptionChanged(AudioCaptureDeviceType);
+        }
+
+        // We can free the user data as we will not be called again.
+        delete u;
+
+        // Some debug
+        logMessage(QString("Output Device Priority List:"));
+        for (int i = Phonon::NoCategory; i <= Phonon::LastCategory; ++i) {
+            Phonon::Category cat = static_cast<Phonon::Category>(i);
+            if (s_outputDevicePriorities.contains(cat)) {
+                logMessage(QString("  Phonon Category %1").arg(cat));
+                int count = 0;
+                foreach (int j, s_outputDevicePriorities[cat]) {
+                    QHash<QByteArray, QVariant> &props = s_outputDevices[j].properties;
+                    logMessage(QString("    %1. %2 (Available: %3)").arg(++count).arg(props["name"].toString()).arg(props["available"].toBool()));
+                }
+            }
+        }
+        logMessage(QString("Capture Device Priority List:"));
+        for (int i = Phonon::NoCategory; i <= Phonon::LastCategory; ++i) {
+            Phonon::Category cat = static_cast<Phonon::Category>(i);
+            if (s_captureDevicePriorities.contains(cat)) {
+                logMessage(QString("  Phonon Category %1").arg(cat));
+                int count = 0;
+                foreach (int j, s_captureDevicePriorities[cat]) {
+                    QHash<QByteArray, QVariant> &props = s_captureDevices[j].properties;
+                    logMessage(QString("    %1. %2 (Available: %3)").arg(++count).arg(props["name"].toString()).arg(props["available"].toBool()));
+                }
+            }
+        }
+    }
+
+    if (!info)
+        return;
+
+    Q_ASSERT(info->name);
+    Q_ASSERT(info->description);
+    Q_ASSERT(info->icon);
+
+    // QString wrapper
+    QString name(info->name);
+    int index;
+    QMap<Phonon::Category, QMap<int, int> > *new_prio_map_cats; // prio, device
+    QMap<QString, AudioDevice> *new_devices;
+
+    if (name.startsWith("sink:")) {
+        new_devices = &u->newOutputDevices;
+        new_prio_map_cats = &u->newOutputDevicePriorities;
+
+        if (s_outputDeviceIndexes.contains(name))
+            index = s_outputDeviceIndexes[name];
+        else
+            index = s_outputDeviceIndexes[name] = s_deviceIndexCounter++;
+    } else if (name.startsWith("source:")) {
+        new_devices = &u->newCaptureDevices;
+        new_prio_map_cats = &u->newCaptureDevicePriorities;
+
+        if (s_captureDeviceIndexes.contains(name))
+            index = s_captureDeviceIndexes[name];
+        else
+            index = s_captureDeviceIndexes[name] = s_deviceIndexCounter++;
+    } else {
+        // This indicates a bug in pulseaudio.
+        return;
+    }
+
+    // Add the new device itself.
+    new_devices->insert(name, AudioDevice(name, info->description, info->icon, info->index));
+
+    // For each role in the priority, map it to a phonon category and store the order.
+    for (uint32_t i = 0; i < info->n_role_priorities; ++i) {
+        pa_ext_device_manager_role_priority_info* role_prio = &info->role_priorities[i];
+        Q_ASSERT(role_prio->role);
+
+        if (s_roleCategoryMap.contains(role_prio->role)) {
+            Phonon::Category cat = s_roleCategoryMap[role_prio->role];
+
+            (*new_prio_map_cats)[cat].insert(role_prio->priority, index);
+        }
+    }
+}
+
+static void set_output_device(QString streamUuid)
+{
+    // If we only have one device, bail. This will be true if we are not using module-device-manager
+    if (s_outputDevices.size() < 2)
+        return;
+
+    if (!s_outputStreamMoveQueue.contains(streamUuid))
+        return;
+
+    if (!s_outputStreamIndexMap.contains(streamUuid))
+        return;
+
+    if (s_outputStreamIndexMap[streamUuid] == PA_INVALID_INDEX)
+        return;
+
+    int device = s_outputStreamMoveQueue[streamUuid];
+    if (!s_outputDevices.contains(device))
+        return;
+
+    // We don't remove the uuid from the s_captureStreamMoveQueue
+    // as an application may reuse the phonon AudioOutput object
+
+    uint32_t pulse_device_index = s_outputDevices[device].pulseIndex;
+    uint32_t pulse_stream_index = s_outputStreamIndexMap[streamUuid];
+
+    const QVariant var = s_outputDevices[device].properties["name"];
+    logMessage(QString("Moving Pulse Sink Input %1 to '%2' (Pulse Sink %3)").arg(pulse_stream_index).arg(var.toString()).arg(pulse_device_index));
+
+    /// @todo Find a way to move the stream without saving it... We don't want to pollute the stream restore db.
+    pa_operation* o;
+    if (!(o = pa_context_move_sink_input_by_index(s_context, pulse_stream_index, pulse_device_index, NULL, NULL))) {
+        logMessage(QString("pa_context_move_sink_input_by_index() failed"));
+        return;
+    }
+    pa_operation_unref(o);
+}
+
+static void set_capture_device(QString streamUuid)
+{
+    // If we only have one device, bail. This will be true if we are not using module-device-manager
+    if (s_captureDevices.size() < 2)
+        return;
+
+    if (!s_captureStreamMoveQueue.contains(streamUuid))
+        return;
+
+    if (!s_captureStreamIndexMap.contains(streamUuid))
+        return;
+
+    if (s_captureStreamIndexMap[streamUuid] == PA_INVALID_INDEX)
+        return;
+
+    int device = s_captureStreamMoveQueue[streamUuid];
+    if (!s_captureDevices.contains(device))
+        return;
+
+    // We don't remove the uuid from the s_captureStreamMoveQueue
+    // as an application may reuse the phonon AudioCapture object (when it exists!)
+
+    uint32_t pulse_device_index = s_captureDevices[device].pulseIndex;
+    uint32_t pulse_stream_index = s_captureStreamIndexMap[streamUuid];
+
+    const QVariant var = s_captureDevices[device].properties["name"];
+    logMessage(QString("Moving Pulse Source Output %1 to '%2' (Pulse Sink %3)").arg(pulse_stream_index).arg(var.toString()).arg(pulse_device_index));
+
+    /// @todo Find a way to move the stream without saving it... We don't want to pollute the stream restore db.
+    pa_operation* o;
+    if (!(o = pa_context_move_source_output_by_index(s_context, pulse_stream_index, pulse_device_index, NULL, NULL))) {
+        logMessage(QString("pa_context_move_source_output_by_index() failed"));
+        return;
+    }
+    pa_operation_unref(o);
+}
+
+void sink_input_cb(pa_context *c, const pa_sink_input_info *i, int eol, void *userdata) {
+    Q_UNUSED(userdata);
+    Q_ASSERT(c);
+
+    if (eol < 0) {
+        if (pa_context_errno(c) == PA_ERR_NOENTITY)
+            return;
+
+        logMessage(QString("Sink input callback failure"));
+        return;
+    }
+
+    if (eol > 0)
+        return;
+
+    Q_ASSERT(i);
+
+    // loop through (*i) and extract phonon->streamindex...
+    const char *t;
+    if ((t = pa_proplist_gets(i->proplist, "phonon.streamid"))) {
+        logMessage(QString("Found PulseAudio stream index %1 for Phonon Output Stream %2").arg(i->index).arg(t));
+        s_outputStreamIndexMap[QString(t)] = i->index;
+        // Process any pending moves...
+        set_output_device(QString(t));
+    }
+}
+
+void source_output_cb(pa_context *c, const pa_source_output_info *i, int eol, void *userdata) {
+    Q_UNUSED(userdata);
+    Q_ASSERT(c);
+
+    if (eol < 0) {
+        if (pa_context_errno(c) == PA_ERR_NOENTITY)
+            return;
+
+        logMessage(QString("Source output callback failure"));
+        return;
+    }
+
+    if (eol > 0)
+        return;
+
+    Q_ASSERT(i);
+
+    // loop through (*i) and extract phonon->streamindex...
+    const char *t;
+    if ((t = pa_proplist_gets(i->proplist, "phonon.streamid"))) {
+        logMessage(QString("Found PulseAudio stream index %1 for Phonon Capture Stream %2").arg(i->index).arg(t));
+        s_captureStreamIndexMap[QString(t)] = i->index;
+        // Process any pending moves...
+        set_capture_device(QString(t));
+    }
+}
+
+static void subscribe_cb(pa_context *c, pa_subscription_event_type_t t, uint32_t index, void *userdata) {
+    Q_UNUSED(userdata);
+
+    switch (t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) {
+        case PA_SUBSCRIPTION_EVENT_SINK_INPUT:
+            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
+                QString phononid = s_outputStreamIndexMap.key(index);
+                if (!phononid.isEmpty()) {
+                    if (s_outputStreamIndexMap.contains(phononid)) {
+                        logMessage(QString("Phonon Output Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(phononid));
+                        s_outputStreamIndexMap[phononid] = PA_INVALID_INDEX;
+                    } else {
+                        logMessage(QString("Removing Phonon Output Stream %1 (it's gone!)").arg(phononid));
+                        s_outputStreamIndexMap.remove(phononid);
+                        s_outputStreamMoveQueue.remove(phononid);
+                    }
+                }
+            } else {
+                pa_operation *o;
+                if (!(o = pa_context_get_sink_input_info(c, index, sink_input_cb, NULL))) {
+                    logMessage(QString("pa_context_get_sink_input_info() failed"));
+                    return;
+                }
+                pa_operation_unref(o);
+            }
+            break;
+
+        case PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT:
+            if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
+                QString phononid = s_captureStreamIndexMap.key(index);
+                if (!phononid.isEmpty()) {
+                    if (s_captureStreamIndexMap.contains(phononid)) {
+                        logMessage(QString("Phonon Capture Stream %1 is gone at the PA end. Marking it as invalid in our cache as we may reuse it.").arg(phononid));
+                        s_captureStreamIndexMap[phononid] = PA_INVALID_INDEX;
+                    } else {
+                        logMessage(QString("Removing Phonon Capture Stream %1 (it's gone!)").arg(phononid));
+                        s_captureStreamIndexMap.remove(phononid);
+                        s_captureStreamMoveQueue.remove(phononid);
+                    }
+                }
+            } else {
+                pa_operation *o;
+                if (!(o = pa_context_get_source_output_info(c, index, source_output_cb, NULL))) {
+                    logMessage(QString("pa_context_get_sink_input_info() failed"));
+                    return;
+                }
+                pa_operation_unref(o);
+            }
+            break;
+    }
+}
+
+
+static void ext_device_manager_subscribe_cb(pa_context *c, void *) {
+    Q_ASSERT(c);
+
+    pa_operation *o;
+    PulseUserData *u = new PulseUserData; /** @todo Make some object to receive the info... */
+    if (!(o = pa_ext_device_manager_read(c, ext_device_manager_read_cb, u))) {
+        // We need to deal with failure on first iteration
+        if (s_connectionEventloop) {
+            s_connectionEventloop->exit(0);
+            s_connectionEventloop = NULL;
+        }
+        logMessage(QString("pa_ext_device_manager_read() failed"));
+        return;
+    }
+    pa_operation_unref(o);
+
+
+    // Register for the stream changes...
+    pa_context_set_subscribe_callback(c, subscribe_cb, NULL);
+
+    if (!(o = pa_context_subscribe(c, (pa_subscription_mask_t)
+                                   (PA_SUBSCRIPTION_MASK_SINK_INPUT|
+                                    PA_SUBSCRIPTION_MASK_SOURCE_OUTPUT), NULL, NULL))) {
+        logMessage(QString("pa_context_subscribe() failed"));
+        return;
+    }
+    pa_operation_unref(o);
+}
+
+static void context_state_callback(pa_context *c, void *)
+{
+    Q_ASSERT(c);
+
+    switch (pa_context_get_state(c)) {
+        case PA_CONTEXT_UNCONNECTED:
+        case PA_CONTEXT_CONNECTING:
+        case PA_CONTEXT_AUTHORIZING:
+        case PA_CONTEXT_SETTING_NAME:
+            break;
+
+        case PA_CONTEXT_READY:
+            // Attempt to load things up
+            ext_device_manager_subscribe_cb(c, NULL);
+            break;
+
+        case PA_CONTEXT_FAILED:
+            s_pulseActive = false;
+            if (s_connectionEventloop) {
+                s_connectionEventloop->exit(0);
+                s_connectionEventloop = NULL;
+            }
+            break;
+
+        case PA_CONTEXT_TERMINATED:
+        default:
+            s_pulseActive = false;
+            /// @todo Deal with reconnection...
+            break;
+    }
+}
+#endif // HAVE_PULSEAUDIO
+
+
+PulseSupport* PulseSupport::getInstance()
+{
+    if (NULL == s_instance) {
+        s_instance = new PulseSupport();
+    }
+    return s_instance;
+}
+
+void PulseSupport::shutdown()
+{
+    if (NULL != s_instance) {
+        delete s_instance;
+        s_instance = NULL;
+    }
+}
+
+PulseSupport::PulseSupport()
+ : QObject()
+{
+#ifdef HAVE_PULSEAUDIO
+    // Initialise our map (is there a better way to do this?)
+    s_roleCategoryMap["none"] = Phonon::NoCategory;
+    s_roleCategoryMap["video"] = Phonon::VideoCategory;
+    s_roleCategoryMap["music"] = Phonon::MusicCategory;
+    s_roleCategoryMap["game"] = Phonon::GameCategory;
+    s_roleCategoryMap["event"] = Phonon::NotificationCategory;
+    s_roleCategoryMap["phone"] = Phonon::CommunicationCategory;
+    //s_roleCategoryMap["animation"]; // No Mapping
+    //s_roleCategoryMap["production"]; // No Mapping
+    s_roleCategoryMap["a11y"] = Phonon::AccessibilityCategory;
+
+    // To allow for easy debugging, give an easy way to disable this pulseaudio check
+    QString pulseenv = qgetenv("PHONON_PULSEAUDIO_DISABLE");
+    if (pulseenv.toInt())
+        return;
+
+    s_mainloop = pa_glib_mainloop_new(NULL);
+    Q_ASSERT(s_mainloop);
+    pa_mainloop_api *api = pa_glib_mainloop_get_api(s_mainloop);
+
+    // We create a simple event loop to allow the glib loop
+    // to iterate until we've connected or not to the server.
+    s_connectionEventloop = new QEventLoop;
+
+    // XXX I don't want to show up in the client list. All I want to know is the list of sources
+    // and sinks...
+    s_context = pa_context_new(api, "libphonon");
+    // (cg) Convert to PA_CONTEXT_NOFLAGS when PulseAudio 0.9.19 is required
+    if (pa_context_connect(s_context, NULL, static_cast<pa_context_flags_t>(0), 0) >= 0) {
+        pa_context_set_state_callback(s_context, &context_state_callback, s_connectionEventloop);
+        // Now we block until we connect or otherwise...
+        s_connectionEventloop->exec();
+    }
+#endif
+}
+
+PulseSupport::~PulseSupport()
+{
+#ifdef HAVE_PULSEAUDIO
+    if (s_context) {
+        pa_context_disconnect(s_context);
+        s_context = NULL;
+    }
+
+    if (s_mainloop) {
+        pa_glib_mainloop_free(s_mainloop);
+        s_mainloop = NULL;
+    }
+
+    if (s_connectionEventloop) {
+        delete s_connectionEventloop;
+        s_connectionEventloop = NULL;
+    }
+#endif
+}
+
+bool PulseSupport::isActive()
+{
+#ifdef HAVE_PULSEAUDIO
+    return s_pulseActive;
+#else
+    return false;
+#endif
+}
+
+void PulseSupport::disable()
+{
+#ifdef HAVE_PULSEAUDIO
+    s_pulseActive = false;
+#endif
+}
+
+QList<int> PulseSupport::objectDescriptionIndexes(ObjectDescriptionType type) const
+{
+    QList<int> list;
+
+    if (type != AudioOutputDeviceType && type != AudioCaptureDeviceType)
+        return list;
+
+#ifdef HAVE_PULSEAUDIO
+    if (s_pulseActive) {
+        switch (type) {
+
+            case AudioOutputDeviceType: {
+                QMap<QString, int>::iterator it;
+                for (it = s_outputDeviceIndexes.begin(); it != s_outputDeviceIndexes.end(); ++it) {
+                    list.append(*it);
+                }
+                break;
+            }
+            case AudioCaptureDeviceType: {
+                QMap<QString, int>::iterator it;
+                for (it = s_captureDeviceIndexes.begin(); it != s_captureDeviceIndexes.end(); ++it) {
+                    list.append(*it);
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+#endif
+
+    return list;
+}
+
+QHash<QByteArray, QVariant> PulseSupport::objectDescriptionProperties(ObjectDescriptionType type, int index) const
+{
+    QHash<QByteArray, QVariant> ret;
+
+    if (type != AudioOutputDeviceType && type != AudioCaptureDeviceType)
+        return ret;
+
+#ifndef HAVE_PULSEAUDIO
+    Q_UNUSED(index);
+#else
+    if (s_pulseActive) {
+        switch (type) {
+
+            case AudioOutputDeviceType:
+                Q_ASSERT(s_outputDevices.contains(index));
+                ret = s_outputDevices[index].properties;
+                break;
+
+            case AudioCaptureDeviceType:
+                Q_ASSERT(s_captureDevices.contains(index));
+                ret = s_captureDevices[index].properties;
+                break;
+
+            default:
+                break;
+        }
+    }
+#endif
+
+    return ret;
+}
+
+QList<int> PulseSupport::objectIndexesByCategory(ObjectDescriptionType type, Category category) const
+{
+    QList<int> ret;
+
+    if (type != AudioOutputDeviceType && type != AudioCaptureDeviceType)
+        return ret;
+
+#ifndef HAVE_PULSEAUDIO
+    Q_UNUSED(category);
+#else
+    if (s_pulseActive) {
+        switch (type) {
+
+            case AudioOutputDeviceType:
+                if (s_outputDevicePriorities.contains(category))
+                    ret = s_outputDevicePriorities[category].values();
+                break;
+
+            case AudioCaptureDeviceType:
+                if (s_captureDevicePriorities.contains(category))
+                    ret = s_captureDevicePriorities[category].values();
+                break;
+
+            default:
+                break;
+        }
+    }
+#endif
+
+    return ret;
+}
+
+#ifdef HAVE_PULSEAUDIO
+static void setDevicePriority(Category category, QStringList list)
+{
+    QString role = s_roleCategoryMap.key(category);
+    if (role.isEmpty())
+        return;
+
+    logMessage(QString("Reindexing %1: %2").arg(role).arg(list.join(", ")));
+
+    char **devices;
+    devices = pa_xnew(char *, list.size()+1);
+    int i = 0;
+    foreach (QString str, list) {
+        devices[i++] = pa_xstrdup(str.toUtf8().constData());
+    }
+    devices[list.size()] = NULL;
+
+    pa_operation *o;
+    if (!(o = pa_ext_device_manager_reorder_devices_for_role(s_context, role.toUtf8().constData(), (const char**)devices, NULL, NULL)))
+        logMessage(QString("pa_ext_device_manager_reorder_devices_for_role() failed"));
+    else
+        pa_operation_unref(o);
+
+    for (i = 0; i < list.size(); ++i)
+        pa_xfree(devices[i]);
+    pa_xfree(devices);
+}
+#endif
+
+void PulseSupport::setOutputDevicePriorityForCategory(Category category, QList<int> order)
+{
+#ifndef HAVE_PULSEAUDIO
+    Q_UNUSED(category);
+    Q_UNUSED(order);
+#else
+    QStringList list;
+    QList<int>::iterator it;
+
+    for (it = order.begin(); it != order.end(); ++it) {
+        if (s_outputDevices.contains(*it)) {
+            list << s_outputDeviceIndexes.key(*it);
+        }
+    }
+    setDevicePriority(category, list);
+#endif
+}
+
+void PulseSupport::setCaptureDevicePriorityForCategory(Category category, QList<int> order)
+{
+#ifndef HAVE_PULSEAUDIO
+    Q_UNUSED(category);
+    Q_UNUSED(order);
+#else
+    QStringList list;
+    QList<int>::iterator it;
+
+    for (it = order.begin(); it != order.end(); ++it) {
+        if (s_captureDevices.contains(*it)) {
+            list << s_captureDeviceIndexes.key(*it);
+        }
+    }
+    setDevicePriority(category, list);
+#endif
+}
+
+void PulseSupport::setStreamPropList(Category category, QString streamUuid)
+{
+#ifndef HAVE_PULSEAUDIO
+    Q_UNUSED(category);
+    Q_UNUSED(streamUuid);
+#else
+    QString role = s_roleCategoryMap.key(category);
+    if (role.isEmpty())
+        return;
+
+    logMessage(QString("Setting role to %1 for streamindex %2").arg(role).arg(streamUuid));
+    setenv("PULSE_PROP_media.role", role.toLatin1().constData(), 1);
+    setenv("PULSE_PROP_phonon.streamid", streamUuid.toLatin1().constData(), 1);
+#endif
+}
+
+void PulseSupport::emitObjectDescriptionChanged(ObjectDescriptionType type)
+{
+    emit objectDescriptionChanged(type);
+}
+
+bool PulseSupport::setOutputDevice(QString streamUuid, int device) {
+#ifndef HAVE_PULSEAUDIO
+    Q_UNUSED(streamUuid);
+    Q_UNUSED(device);
+    return false;
+#else
+    if (s_outputDevices.size() < 2)
+        return true;
+
+    if (!s_outputDevices.contains(device)) {
+        logMessage(QString("Attempting to set Output Device for invalid device id %1.").arg(device));
+        return false;
+    }
+    const QVariant var = s_outputDevices[device].properties["name"];
+    logMessage(QString("Attempting to set Output Device to '%1' for Output Stream %2").arg(var.toString()).arg(streamUuid));
+
+    s_outputStreamMoveQueue[streamUuid] = device;
+    // Attempt to look up the pulse stream index.
+    if (s_outputStreamIndexMap.contains(streamUuid) && s_outputStreamIndexMap[streamUuid] != PA_INVALID_INDEX) {
+        logMessage(QString("... Found in map. Moving now"));
+        set_output_device(streamUuid);
+    } else {
+        logMessage(QString("... Not found in map. Saving move for when the stream appears"));
+    }
+    return true;
+#endif
+}
+
+bool PulseSupport::setCaptureDevice(QString streamUuid, int device) {
+#ifndef HAVE_PULSEAUDIO
+    Q_UNUSED(streamUuid);
+    Q_UNUSED(device);
+    return false;
+#else
+    if (s_captureDevices.size() < 2)
+        return true;
+
+    if (!s_captureDevices.contains(device)) {
+        logMessage(QString("Attempting to set Capture Device for invalid device id %1.").arg(device));
+        return false;
+    }
+    const QVariant var = s_captureDevices[device].properties["name"];
+    logMessage(QString("Attempting to set Capture Device to '%1' for Capture Stream %2").arg(var.toString()).arg(streamUuid));
+
+    s_captureStreamMoveQueue[streamUuid] = device;
+    // Attempt to look up the pulse stream index.
+    if (s_captureStreamIndexMap.contains(streamUuid) && s_captureStreamIndexMap[streamUuid] == PA_INVALID_INDEX) {
+        logMessage(QString("... Found in map. Moving now"));
+        set_capture_device(streamUuid);
+    } else {
+        logMessage(QString("... Not found in map. Saving move for when the stream appears"));
+    }
+    return true;
+#endif
+}
+
+void PulseSupport::clearStreamCache(QString streamUuid) {
+#ifndef HAVE_PULSEAUDIO
+    Q_UNUSED(streamUuid);
+    return;
+#else
+    logMessage(QString("Clearing stream cache for stream %1").arg(streamUuid));
+    s_outputStreamIndexMap.remove(streamUuid);
+    s_outputStreamMoveQueue.remove(streamUuid);
+    s_captureStreamIndexMap.remove(streamUuid);
+    s_captureStreamMoveQueue.remove(streamUuid);
+#endif
+}
+
+} // namespace Phonon
+
+QT_END_NAMESPACE
+
+// vim: sw=4 ts=4
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/pulsesupport.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/pulsesupport.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/pulsesupport.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/pulsesupport.h	2010-02-23 14:47:28.340633635 +0100
@@ -0,0 +1,74 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2009 Colin Guthrie <cguthrie@mandriva.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation 
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public 
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef PHONON_PULSESUPPORT_H
+#define PHONON_PULSESUPPORT_H
+
+#include "phonon_export.h"
+#include "phononnamespace.h"
+#include "objectdescription.h"
+
+#include <QtCore/QtGlobal>
+#include <QtCore/QSet>
+
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
+namespace Phonon
+{
+    class PHONON_EXPORT PulseSupport : public QObject
+    {
+        Q_OBJECT
+        public:
+            static PulseSupport* getInstance();
+            static void shutdown();
+
+            bool isActive();
+            void disable();
+
+            QList<int> objectDescriptionIndexes(ObjectDescriptionType type) const;
+            QHash<QByteArray, QVariant> objectDescriptionProperties(ObjectDescriptionType type, int index) const;
+            QList<int> objectIndexesByCategory(ObjectDescriptionType type, Category category) const;
+
+            void setOutputDevicePriorityForCategory(Category category, QList<int> order);
+            void setCaptureDevicePriorityForCategory(Category category, QList<int> order);
+
+            void setStreamPropList(Category category, QString streamUuid);
+            void emitObjectDescriptionChanged(ObjectDescriptionType);
+
+            bool setOutputDevice(QString streamUuid, int device);
+            bool setCaptureDevice(QString streamUuid, int device);
+            void clearStreamCache(QString streamUuid);
+
+        signals:
+            void objectDescriptionChanged(ObjectDescriptionType);
+        private:
+            PulseSupport();
+            ~PulseSupport();
+    };
+} // namespace Phonon
+
+QT_END_NAMESPACE
+QT_END_HEADER
+
+#endif // PHONON_PULSESUPPORT_H
+  
\ No newline at end of file
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/qsettingsgroup_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/qsettingsgroup_p.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/qsettingsgroup_p.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/qsettingsgroup_p.h	2010-02-23 14:47:28.340633635 +0100
@@ -27,8 +27,6 @@
 #include <QtCore/QString>
 #include <QtCore/QVariant>
 
-#ifndef QT_NO_PHONON_SETTINGSGROUP
-
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
@@ -89,6 +87,5 @@ class QSettingsGroup
 
 QT_END_NAMESPACE
 QT_END_HEADER
-#endif //QT_NO_PHONON_SETTINGSGROUP
 
 #endif // PHONON_QSETTINGSGROUP_P_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/seekslider.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/seekslider.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/seekslider.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/seekslider.cpp	2010-02-23 14:47:28.344614315 +0100
@@ -72,12 +72,12 @@ void SeekSlider::setMediaObject(MediaObj
     d->media = media;
 
     if (media) {
-        connect(media, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
+        connect(media, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
                 SLOT(_k_stateChanged(Phonon::State)));
         connect(media, SIGNAL(totalTimeChanged(qint64)), SLOT(_k_length(qint64)));
         connect(media, SIGNAL(tick(qint64)), SLOT(_k_tick(qint64)));
         connect(media, SIGNAL(seekableChanged(bool)), SLOT(_k_seekableChanged(bool)));
-        connect(media, SIGNAL(currentSourceChanged(Phonon::MediaSource)), SLOT(_k_currentSourceChanged()));
+        connect(media, SIGNAL(currentSourceChanged(const Phonon::MediaSource&)), SLOT(_k_currentSourceChanged()));
         d->_k_stateChanged(media->state());
         d->_k_seekableChanged(media->isSeekable());
         d->_k_length(media->totalTime());
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/seekslider_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/seekslider_p.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/seekslider_p.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/seekslider_p.h	2010-02-23 14:47:28.344614315 +0100
@@ -24,8 +24,8 @@
 #define SEEKSLIDER_P_H
 
 #include "seekslider.h"
+#include "swiftslider_p.h"
 #include <QtGui/QBoxLayout>
-#include <QtGui/QSlider>
 #include <QtGui/QLabel>
 #include <QtGui/QPixmap>
 #include <QtGui/QIcon>
@@ -84,7 +84,7 @@ class SeekSliderPrivate
         void _k_currentSourceChanged();
 
         QBoxLayout layout;
-        QSlider slider;
+        SwiftSlider slider;
         QLabel iconLabel;
         QPointer<MediaObject> media;
         bool ticking;
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/swiftslider.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/swiftslider.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/swiftslider.cpp	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/swiftslider.cpp	2010-02-23 14:47:28.344614315 +0100
@@ -0,0 +1,103 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2006-2008 Ricardo Villalba <rvm@escomposlinux.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "swiftslider_p.h"
+
+#include <QtGui/QMouseEvent>
+#include <QtGui/QStyle>
+#include <QtGui/QStyleOption>
+
+QT_BEGIN_NAMESPACE
+
+#if !defined(QT_NO_PHONON_SEEKSLIDER) && !defined(QT_NO_PHONON_VOLUMESLIDER)
+
+namespace Phonon
+{
+
+SwiftSlider::SwiftSlider(Qt::Orientation orientation, QWidget * parent)
+	: QSlider(orientation, parent)
+{
+}
+
+SwiftSlider::~SwiftSlider()
+{
+}
+
+// Function copied from qslider.cpp
+inline int SwiftSlider::pick(const QPoint &pt) const
+{
+    return orientation() == Qt::Horizontal ? pt.x() : pt.y();
+}
+
+// Function copied from qslider.cpp and modified to make it compile
+int SwiftSlider::pixelPosToRangeValue(int pos) const
+{
+    QStyleOptionSlider opt;
+    initStyleOption(&opt);
+    QRect gr = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderGroove, this);
+    QRect sr = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this);
+    int sliderMin, sliderMax, sliderLength;
+
+    if (orientation() == Qt::Horizontal) {
+        sliderLength = sr.width();
+        sliderMin = gr.x();
+        sliderMax = gr.right() - sliderLength + 1;
+    } else {
+        sliderLength = sr.height();
+        sliderMin = gr.y();
+        sliderMax = gr.bottom() - sliderLength + 1;
+    }
+    return QStyle::sliderValueFromPosition(minimum(), maximum(), pos - sliderMin,
+                                           sliderMax - sliderMin, opt.upsideDown);
+}
+
+// Based on code from qslider.cpp
+void SwiftSlider::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton) {
+        QStyleOptionSlider opt;
+        initStyleOption(&opt);
+        const QRect sliderRect = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderHandle, this);
+        const QPoint center = sliderRect.center() - sliderRect.topLeft();
+        // to take half of the slider off for the setSliderPosition call we use the center - topLeft
+
+        if (!sliderRect.contains(event->pos())) {
+            event->accept();
+
+            setSliderPosition(pixelPosToRangeValue(pick(event->pos() - center)));
+            triggerAction(SliderMove);
+            setRepeatAction(SliderNoAction);
+        } else {
+            QSlider::mousePressEvent(event);
+        }
+    } else {
+        QSlider::mousePressEvent(event);
+    }
+}
+
+} // namespace Phonon
+
+#endif //QT_NO_PHONON_VOLUMESLIDER && QT_NO_PHONON_VOLUMESLIDER
+
+QT_END_NAMESPACE
+
+#include "moc_swiftslider_p.cpp"
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/swiftslider_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/swiftslider_p.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/swiftslider_p.h	1970-01-01 01:00:00.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/swiftslider_p.h	2010-02-23 14:47:28.344614315 +0100
@@ -0,0 +1,68 @@
+/*  This file is part of the KDE project
+    Copyright (C) 2006-2008 Ricardo Villalba <rvm@escomposlinux.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) version 3, or any
+    later version accepted by the membership of KDE e.V. (or its
+    successor approved by the membership of KDE e.V.), Nokia Corporation
+    (or its successors, if any) and the KDE Free Qt Foundation, which shall
+    act as a proxy defined in Section 6 of version 3 of the license.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef SWIFTSLIDER_H
+#define SWIFTSLIDER_H
+
+#include <QtGui/QSlider>
+
+QT_BEGIN_NAMESPACE
+
+#if !defined(QT_NO_PHONON_SEEKSLIDER) && !defined(QT_NO_PHONON_VOLUMESLIDER)
+
+namespace Phonon
+{
+
+/** \class SwiftSlider swiftslider_p.h Phonon/SwiftSlider
+ * \short Modified QSlider that allows sudden/quick moves instead of stepped moves ("Click'n'Go" QSlider)
+ *
+ * This is an internal class used by SeekSlider and VolumeSlider.
+ *
+ * Ricardo Villalba, the original author of MySlider.cpp (from the SMPlayer project)
+ * gave his permission for the inclusion of this code inside Phonon by
+ * switching MySlider.cpp to the LGPLv2.1+ license.
+ * See http://smplayer.svn.sourceforge.net/viewvc/smplayer/smplayer/trunk/src/myslider.cpp?revision=2406&view=markup
+ *
+ * The original discussion about a "Click'n'Go QSlider": http://lists.trolltech.com/qt-interest/2006-11/msg00363.html
+ *
+ * \ingroup PhononWidgets
+ */
+class SwiftSlider : public QSlider
+{
+	Q_OBJECT
+public:
+	SwiftSlider(Qt::Orientation orientation, QWidget * parent);
+	~SwiftSlider();
+
+private:
+	void mousePressEvent(QMouseEvent *event);
+	inline int pick(const QPoint &pt) const;
+	int pixelPosToRangeValue(int pos) const;
+};
+
+} // namespace Phonon
+
+#endif //QT_NO_PHONON_VOLUMESLIDER && QT_NO_PHONON_VOLUMESLIDER
+
+QT_END_NAMESPACE
+
+#endif //SWIFTSLIDER_H
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/videowidget.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/videowidget.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/videowidget.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/videowidget.cpp	2010-02-23 14:47:28.344614315 +0100
@@ -28,8 +28,9 @@
 #include "phononnamespace_p.h"
 
 #include <QtGui/QAction>
-
-#define PHONON_INTERFACENAME VideoWidgetInterface
+#define IFACES4 VideoWidgetInterface44
+#define IFACES0 VideoWidgetInterface, IFACES4
+#define PHONON_INTERFACENAME IFACES0
 
 QT_BEGIN_NAMESPACE
 
@@ -48,6 +49,8 @@ VideoWidget::VideoWidget(QWidget *parent
     setMouseTracking(true);
 }
 
+
+
 VideoWidget::VideoWidget(VideoWidgetPrivate &dd, QWidget *parent)
     : QWidget(parent),
     Phonon::AbstractVideoOutput(dd)
@@ -98,6 +101,15 @@ PHONON_INTERFACE_SETTER(setHue, hue, qre
 PHONON_INTERFACE_GETTER(qreal, saturation, d->saturation)
 PHONON_INTERFACE_SETTER(setSaturation, saturation, qreal)
 
+
+QImage VideoWidget::snapshot() const {
+    K_D(const VideoWidget);
+    ConstIface<IFACES4> iface(d);
+    if(iface) return iface->snapshot();
+    return QImage(); // TODO not implemented in VideoInterface
+}
+
+
 void VideoWidget::setFullScreen(bool newFullScreen)
 {
     pDebug() << Q_FUNC_INFO << newFullScreen;
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/videowidget.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/videowidget.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/videowidget.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/videowidget.h	2010-02-23 14:47:28.344614315 +0100
@@ -172,6 +172,7 @@ class AbstractVideoOutput;
             qreal contrast() const;
             qreal hue() const;
             qreal saturation() const;
+            QImage snapshot() const;
 
             //TODO: bar colors property
         public Q_SLOTS:
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/videowidgetinterface.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/videowidgetinterface.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/videowidgetinterface.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/videowidgetinterface.h	2010-02-23 14:47:28.344614315 +0100
@@ -53,8 +53,21 @@ class VideoWidgetInterface
 //X        virtual int overlayCapabilities() const = 0;
 //X        virtual bool createOverlay(QWidget *widget, int type) = 0;
 };
+
+class VideoWidgetInterface44 : public VideoWidgetInterface
+{
+    public:
+        virtual QImage snapshot() const = 0;
+};
 }
 
+#ifdef PHONON_BACKEND_VERSION_4_4
+namespace Phonon { typedef VideoWidgetInterface44 VideoWidgetInterfaceLatest; }
+#else
+namespace Phonon { typedef VideoWidgetInterface VideoWidgetInterfaceLatest; }
+#endif
+
+Q_DECLARE_INTERFACE(Phonon::VideoWidgetInterface44, "VideoWidgetInterface44.phonon.kde.org")
 Q_DECLARE_INTERFACE(Phonon::VideoWidgetInterface, "VideoWidgetInterface3.phonon.kde.org")
 
 #endif //QT_NO_PHONON_VIDEO
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/volumeslider.cpp qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/volumeslider.cpp
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/volumeslider.cpp	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/volumeslider.cpp	2010-02-23 14:47:28.344614315 +0100
@@ -85,7 +85,7 @@ VolumeSlider::~VolumeSlider()
 
 bool VolumeSlider::isMuteVisible() const
 {
-    return !k_ptr->muteButton.isHidden();
+    return k_ptr->muteButton.isVisible();
 }
 
 void VolumeSlider::setMuteVisible(bool visible)
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/volumeslider_p.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/volumeslider_p.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/phonon/phonon/volumeslider_p.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/3rdparty/phonon/phonon/volumeslider_p.h	2010-02-23 14:47:28.344614315 +0100
@@ -24,8 +24,8 @@
 #define VOLUMESLIDER_P_H
 
 #include "volumeslider.h"
+#include "swiftslider_p.h"
 #include <QtGui/QBoxLayout>
-#include <QtGui/QSlider>
 #include <QtGui/QLabel>
 #include <QtGui/QPixmap>
 #include <QtGui/QToolButton>
@@ -83,7 +83,7 @@ class VolumeSliderPrivate
 
     private:
         QBoxLayout layout;
-        QSlider slider;
+        SwiftSlider slider;
         QToolButton muteButton;
         QIcon volumeIcon;
         QIcon mutedIcon;
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/phonon/phonon.pro qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/phonon/phonon.pro
--- qt-everywhere-opensource-src-4.6.2/src/phonon/phonon.pro	2010-02-11 16:55:22.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/phonon/phonon.pro	2010-02-23 14:47:28.344614315 +0100
@@ -21,6 +21,9 @@ HEADERS += $$PHONON_DIR/abstractaudioout
            $$PHONON_DIR/abstractvideooutput.h \
            $$PHONON_DIR/abstractvideooutput_p.h \
            $$PHONON_DIR/addoninterface.h \
+           $$PHONON_DIR/audiodataoutput.h \
+           $$PHONON_DIR/audiodataoutput_p.h \
+           $$PHONON_DIR/audiodataoutputinterface.h \
            $$PHONON_DIR/audiooutput.h \
            $$PHONON_DIR/audiooutput_p.h \
            $$PHONON_DIR/audiooutputinterface.h \
@@ -36,6 +39,7 @@ HEADERS += $$PHONON_DIR/abstractaudioout
            $$PHONON_DIR/effectwidget_p.h \
            $$PHONON_DIR/factory_p.h \
            $$PHONON_DIR/frontendinterface_p.h \
+           $$PHONON_DIR/globalconfig.h \
            $$PHONON_DIR/globalconfig_p.h \
            $$PHONON_DIR/iodevicestream_p.h \
            $$PHONON_DIR/mediacontroller.h \
@@ -47,6 +51,7 @@ HEADERS += $$PHONON_DIR/abstractaudioout
            $$PHONON_DIR/mediaobjectinterface.h \
            $$PHONON_DIR/mediasource.h \
            $$PHONON_DIR/mediasource_p.h \
+           $$PHONON_DIR/pulsesupport.h \
            $$PHONON_DIR/objectdescription.h \
            $$PHONON_DIR/objectdescription_p.h \
            $$PHONON_DIR/objectdescriptionmodel.h \
@@ -62,6 +67,7 @@ HEADERS += $$PHONON_DIR/abstractaudioout
            $$PHONON_DIR/qsettingsgroup_p.h \
            $$PHONON_DIR/seekslider.h \
            $$PHONON_DIR/seekslider_p.h \
+           $$PHONON_DIR/swiftslider_p.h \
            $$PHONON_DIR/streaminterface.h \
            $$PHONON_DIR/streaminterface_p.h \
            $$PHONON_DIR/videoplayer.h \
@@ -101,7 +107,10 @@ SOURCES += $$PHONON_DIR/objectdescriptio
            $$PHONON_DIR/seekslider.cpp \
            $$PHONON_DIR/volumeslider.cpp \
            $$PHONON_DIR/effectwidget.cpp \
-           $$PHONON_DIR/iodevicestream.cpp
+           $$PHONON_DIR/iodevicestream.cpp \
+           $$PHONON_DIR/audiodataoutput.cpp \
+           $$PHONON_DIR/pulsesupport.cpp \
+           $$PHONON_DIR/swiftslider.cpp
 
 contains(QT_CONFIG, dbus) {
        QT      += dbus
diff -rupdN qt-everywhere-opensource-src-4.6.2/src/tools/uic/qclass_lib_map.h qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/tools/uic/qclass_lib_map.h
--- qt-everywhere-opensource-src-4.6.2/src/tools/uic/qclass_lib_map.h	2010-02-11 16:55:23.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-phonon-4.3.80/src/tools/uic/qclass_lib_map.h	2010-02-23 14:51:02.655613295 +0100
@@ -1,3 +1,139 @@
+QT_CLASS_LIB(QAbstractState, QtCore, qabstractstate.h)
+QT_CLASS_LIB(QAbstractTransition, QtCore, qabstracttransition.h)
+QT_CLASS_LIB(QEventTransition, QtCore, qeventtransition.h)
+QT_CLASS_LIB(QFinalState, QtCore, qfinalstate.h)
+QT_CLASS_LIB(QHistoryState, QtCore, qhistorystate.h)
+QT_CLASS_LIB(QSignalTransition, QtCore, qsignaltransition.h)
+QT_CLASS_LIB(QState, QtCore, qstate.h)
+QT_CLASS_LIB(QStateMachine, QtCore, qstatemachine.h)
+QT_CLASS_LIB(QAbstractEventDispatcher, QtCore, qabstracteventdispatcher.h)
+QT_CLASS_LIB(QModelIndex, QtCore, qabstractitemmodel.h)
+QT_CLASS_LIB(QPersistentModelIndex, QtCore, qabstractitemmodel.h)
+QT_CLASS_LIB(QModelIndexList, QtCore, qabstractitemmodel.h)
+QT_CLASS_LIB(QAbstractItemModel, QtCore, qabstractitemmodel.h)
+QT_CLASS_LIB(QAbstractTableModel, QtCore, qabstractitemmodel.h)
+QT_CLASS_LIB(QAbstractListModel, QtCore, qabstractitemmodel.h)
+QT_CLASS_LIB(QBasicTimer, QtCore, qbasictimer.h)
+QT_CLASS_LIB(QCoreApplication, QtCore, qcoreapplication.h)
+QT_CLASS_LIB(QtCleanUpFunction, QtCore, qcoreapplication.h)
+QT_CLASS_LIB(QEvent, QtCore, qcoreevent.h)
+QT_CLASS_LIB(QTimerEvent, QtCore, qcoreevent.h)
+QT_CLASS_LIB(QChildEvent, QtCore, qcoreevent.h)
+QT_CLASS_LIB(QCustomEvent, QtCore, qcoreevent.h)
+QT_CLASS_LIB(QDynamicPropertyChangeEvent, QtCore, qcoreevent.h)
+QT_CLASS_LIB(QEventLoop, QtCore, qeventloop.h)
+QT_CLASS_LIB(QMetaMethod, QtCore, qmetaobject.h)
+QT_CLASS_LIB(QMetaEnum, QtCore, qmetaobject.h)
+QT_CLASS_LIB(QMetaProperty, QtCore, qmetaobject.h)
+QT_CLASS_LIB(QMetaClassInfo, QtCore, qmetaobject.h)
+QT_CLASS_LIB(QMetaType, QtCore, qmetatype.h)
+QT_CLASS_LIB(QMetaTypeId, QtCore, qmetatype.h)
+QT_CLASS_LIB(QMetaTypeId2, QtCore, qmetatype.h)
+QT_CLASS_LIB(QMimeData, QtCore, qmimedata.h)
+QT_CLASS_LIB(QObjectList, QtCore, qobject.h)
+QT_CLASS_LIB(QObjectData, QtCore, qobject.h)
+QT_CLASS_LIB(QObject, QtCore, qobject.h)
+QT_CLASS_LIB(QObjectUserData, QtCore, qobject.h)
+QT_CLASS_LIB(QObjectCleanupHandler, QtCore, qobjectcleanuphandler.h)
+QT_CLASS_LIB(QGenericArgument, QtCore, qobjectdefs.h)
+QT_CLASS_LIB(QGenericReturnArgument, QtCore, qobjectdefs.h)
+QT_CLASS_LIB(QArgument, QtCore, qobjectdefs.h)
+QT_CLASS_LIB(QReturnArgument, QtCore, qobjectdefs.h)
+QT_CLASS_LIB(QMetaObject, QtCore, qobjectdefs.h)
+QT_CLASS_LIB(QMetaObjectAccessor, QtCore, qobjectdefs.h)
+QT_CLASS_LIB(QMetaObjectExtraData, QtCore, qobjectdefs.h)
+QT_CLASS_LIB(QPointer, QtCore, qpointer.h)
+QT_CLASS_LIB(QSharedMemory, QtCore, qsharedmemory.h)
+QT_CLASS_LIB(QSignalMapper, QtCore, qsignalmapper.h)
+QT_CLASS_LIB(QSocketNotifier, QtCore, qsocketnotifier.h)
+QT_CLASS_LIB(QSystemSemaphore, QtCore, qsystemsemaphore.h)
+QT_CLASS_LIB(QTimer, QtCore, qtimer.h)
+QT_CLASS_LIB(QTranslator, QtCore, qtranslator.h)
+QT_CLASS_LIB(QVariant, QtCore, qvariant.h)
+QT_CLASS_LIB(QVariantList, QtCore, qvariant.h)
+QT_CLASS_LIB(QVariantMap, QtCore, qvariant.h)
+QT_CLASS_LIB(QVariantHash, QtCore, qvariant.h)
+QT_CLASS_LIB(QVariantComparisonHelper, QtCore, qvariant.h)
+QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h)
+QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h)
+QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h)
+QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h)
+QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h)
+QT_CLASS_LIB(QAbstractAnimation, QtCore, qabstractanimation.h)
+QT_CLASS_LIB(QAnimationGroup, QtCore, qanimationgroup.h)
+QT_CLASS_LIB(QParallelAnimationGroup, QtCore, qparallelanimationgroup.h)
+QT_CLASS_LIB(QPauseAnimation, QtCore, qpauseanimation.h)
+QT_CLASS_LIB(QPropertyAnimation, QtCore, qpropertyanimation.h)
+QT_CLASS_LIB(QSequentialAnimationGroup, QtCore, qsequentialanimationgroup.h)
+QT_CLASS_LIB(QVariantAnimation, QtCore, qvariantanimation.h)
+QT_CLASS_LIB(QtEndian, QtCore, qendian.h)
+QT_CLASS_LIB(QtGlobal, QtCore, qglobal.h)
+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
+QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
+QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
+QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
+QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h)
+QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h)
+QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
+QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
+QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h)
+QT_CLASS_LIB(QBool, QtCore, qglobal.h)
+QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
+QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
+QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
+QT_CLASS_LIB(QFlag, QtCore, qglobal.h)
+QT_CLASS_LIB(QIncompatibleFlag, QtCore, qglobal.h)
+QT_CLASS_LIB(QFlags, QtCore, qglobal.h)
+QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
+QT_CLASS_LIB(QForeachContainerBase, QtCore, qglobal.h)
+QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
+QT_CLASS_LIB(QLibraryInfo, QtCore, qlibraryinfo.h)
+QT_CLASS_LIB(Qt, QtCore, qnamespace.h)
+QT_CLASS_LIB(QInternal, QtCore, qnamespace.h)
+QT_CLASS_LIB(QCOORD, QtCore, qnamespace.h)
+QT_CLASS_LIB(QFactoryInterface, QtCore, qfactoryinterface.h)
+QT_CLASS_LIB(QLibrary, QtCore, qlibrary.h)
+QT_CLASS_LIB(QtPlugin, QtCore, qplugin.h)
+QT_CLASS_LIB(QtPluginInstanceFunction, QtCore, qplugin.h)
+QT_CLASS_LIB(QPluginLoader, QtCore, qpluginloader.h)
+QT_CLASS_LIB(QUuid, QtCore, quuid.h)
+QT_CLASS_LIB(QAtomicInt, QtCore, qatomic.h)
+QT_CLASS_LIB(QAtomicPointer, QtCore, qatomic.h)
+QT_CLASS_LIB(QBasicAtomicInt, QtCore, qbasicatomic.h)
+QT_CLASS_LIB(QBasicAtomicPointer, QtCore, qbasicatomic.h)
+QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
+QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
+QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
+QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
+QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
+QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
+QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
+QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
+QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
+QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
+QT_CLASS_LIB(QSemaphore, QtCore, qsemaphore.h)
+QT_CLASS_LIB(QThread, QtCore, qthread.h)
+QT_CLASS_LIB(QThread, QtCore, qthread.h)
+QT_CLASS_LIB(QThreadStorageData, QtCore, qthreadstorage.h)
+QT_CLASS_LIB(QThreadStorage, QtCore, qthreadstorage.h)
+QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
+QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
 QT_CLASS_LIB(QXmlStreamStringRef, QtCore, qxmlstream.h)
 QT_CLASS_LIB(QXmlStreamAttribute, QtCore, qxmlstream.h)
 QT_CLASS_LIB(QXmlStreamAttributes, QtCore, qxmlstream.h)
@@ -10,41 +146,22 @@ QT_CLASS_LIB(QXmlStreamEntityDeclaration
 QT_CLASS_LIB(QXmlStreamEntityResolver, QtCore, qxmlstream.h)
 QT_CLASS_LIB(QXmlStreamReader, QtCore, qxmlstream.h)
 QT_CLASS_LIB(QXmlStreamWriter, QtCore, qxmlstream.h)
-QT_CLASS_LIB(QAbstractFileEngine, QtCore, qabstractfileengine.h)
-QT_CLASS_LIB(QAbstractFileEngineHandler, QtCore, qabstractfileengine.h)
-QT_CLASS_LIB(QAbstractFileEngineIterator, QtCore, qabstractfileengine.h)
-QT_CLASS_LIB(QBuffer, QtCore, qbuffer.h)
-QT_CLASS_LIB(QDataStream, QtCore, qdatastream.h)
-QT_CLASS_LIB(QtDebug, QtCore, qdebug.h)
-QT_CLASS_LIB(QDebug, QtCore, qdebug.h)
-QT_CLASS_LIB(QNoDebug, QtCore, qdebug.h)
-QT_CLASS_LIB(QDir, QtCore, qdir.h)
-QT_CLASS_LIB(QDirIterator, QtCore, qdiriterator.h)
-QT_CLASS_LIB(QFile, QtCore, qfile.h)
-QT_CLASS_LIB(QFileInfo, QtCore, qfileinfo.h)
-QT_CLASS_LIB(QFileInfoList, QtCore, qfileinfo.h)
-QT_CLASS_LIB(QFileInfoListIterator, QtCore, qfileinfo.h)
-QT_CLASS_LIB(QFileSystemWatcher, QtCore, qfilesystemwatcher.h)
-QT_CLASS_LIB(QFSFileEngine, QtCore, qfsfileengine.h)
-QT_CLASS_LIB(QIODevice, QtCore, qiodevice.h)
-QT_CLASS_LIB(Q_PID, QtCore, qprocess.h)
-QT_CLASS_LIB(QProcessEnvironment, QtCore, qprocess.h)
-QT_CLASS_LIB(QProcess, QtCore, qprocess.h)
-QT_CLASS_LIB(QResource, QtCore, qresource.h)
-QT_CLASS_LIB(QSettings, QtCore, qsettings.h)
-QT_CLASS_LIB(QTemporaryFile, QtCore, qtemporaryfile.h)
-QT_CLASS_LIB(QTextStream, QtCore, qtextstream.h)
-QT_CLASS_LIB(QTextStreamFunction, QtCore, qtextstream.h)
-QT_CLASS_LIB(QTextStreamManipulator, QtCore, qtextstream.h)
-QT_CLASS_LIB(QTS, QtCore, qtextstream.h)
-QT_CLASS_LIB(QTextIStream, QtCore, qtextstream.h)
-QT_CLASS_LIB(QTextOStream, QtCore, qtextstream.h)
-QT_CLASS_LIB(QUrl, QtCore, qurl.h)
-QT_CLASS_LIB(QTextCodec, QtCore, qtextcodec.h)
-QT_CLASS_LIB(QTextEncoder, QtCore, qtextcodec.h)
-QT_CLASS_LIB(QTextDecoder, QtCore, qtextcodec.h)
-QT_CLASS_LIB(QTextCodecFactoryInterface, QtCore, qtextcodecplugin.h)
-QT_CLASS_LIB(QTextCodecPlugin, QtCore, qtextcodecplugin.h)
+QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
+QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h)
+QT_CLASS_LIB(QMutableFutureIterator, QtCore, qfuture.h)
+QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
+QT_CLASS_LIB(QFutureInterfaceBase, QtCore, qfutureinterface.h)
+QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h)
+QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h)
+QT_CLASS_LIB(QFutureSynchronizer, QtCore, qfuturesynchronizer.h)
+QT_CLASS_LIB(QFutureWatcherBase, QtCore, qfuturewatcher.h)
+QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h)
+QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h)
+QT_CLASS_LIB(QRunnable, QtCore, qrunnable.h)
+QT_CLASS_LIB(QtConcurrentFilter, QtCore, qtconcurrentfilter.h)
+QT_CLASS_LIB(QtConcurrentMap, QtCore, qtconcurrentmap.h)
+QT_CLASS_LIB(QtConcurrentRun, QtCore, qtconcurrentrun.h)
+QT_CLASS_LIB(QThreadPool, QtCore, qthreadpool.h)
 QT_CLASS_LIB(QtAlgorithms, QtCore, qalgorithms.h)
 QT_CLASS_LIB(QBitArray, QtCore, qbitarray.h)
 QT_CLASS_LIB(QBitRef, QtCore, qbitarray.h)
@@ -159,153 +276,36 @@ QT_CLASS_LIB(QVectorIterator, QtCore, qv
 QT_CLASS_LIB(QMutableVectorIterator, QtCore, qvector.h)
 QT_CLASS_LIB(QVectorIterator, QtCore, qvector.h)
 QT_CLASS_LIB(QMutableVectorIterator, QtCore, qvector.h)
-QT_CLASS_LIB(QtEndian, QtCore, qendian.h)
-QT_CLASS_LIB(QtGlobal, QtCore, qglobal.h)
-QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
-QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
-QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
-QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
-QT_CLASS_LIB(QIntegerForSize, QtCore, qglobal.h)
-QT_CLASS_LIB(QNoImplicitBoolCast, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT8, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT8, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT16, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT16, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT32, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT32, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_INT64, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_UINT64, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_LLONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_ULLONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_LONG, QtCore, qglobal.h)
-QT_CLASS_LIB(Q_ULONG, QtCore, qglobal.h)
-QT_CLASS_LIB(QSysInfo, QtCore, qglobal.h)
-QT_CLASS_LIB(QtMsgHandler, QtCore, qglobal.h)
-QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
-QT_CLASS_LIB(QGlobalStatic, QtCore, qglobal.h)
-QT_CLASS_LIB(QGlobalStaticDeleter, QtCore, qglobal.h)
-QT_CLASS_LIB(QBool, QtCore, qglobal.h)
-QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
-QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
-QT_CLASS_LIB(QTypeInfo, QtCore, qglobal.h)
-QT_CLASS_LIB(QFlag, QtCore, qglobal.h)
-QT_CLASS_LIB(QIncompatibleFlag, QtCore, qglobal.h)
-QT_CLASS_LIB(QFlags, QtCore, qglobal.h)
-QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
-QT_CLASS_LIB(QForeachContainerBase, QtCore, qglobal.h)
-QT_CLASS_LIB(QForeachContainer, QtCore, qglobal.h)
-QT_CLASS_LIB(QLibraryInfo, QtCore, qlibraryinfo.h)
-QT_CLASS_LIB(Qt, QtCore, qnamespace.h)
-QT_CLASS_LIB(QInternal, QtCore, qnamespace.h)
-QT_CLASS_LIB(QCOORD, QtCore, qnamespace.h)
-QT_CLASS_LIB(QAbstractEventDispatcher, QtCore, qabstracteventdispatcher.h)
-QT_CLASS_LIB(QModelIndex, QtCore, qabstractitemmodel.h)
-QT_CLASS_LIB(QPersistentModelIndex, QtCore, qabstractitemmodel.h)
-QT_CLASS_LIB(QModelIndexList, QtCore, qabstractitemmodel.h)
-QT_CLASS_LIB(QAbstractItemModel, QtCore, qabstractitemmodel.h)
-QT_CLASS_LIB(QAbstractTableModel, QtCore, qabstractitemmodel.h)
-QT_CLASS_LIB(QAbstractListModel, QtCore, qabstractitemmodel.h)
-QT_CLASS_LIB(QBasicTimer, QtCore, qbasictimer.h)
-QT_CLASS_LIB(QCoreApplication, QtCore, qcoreapplication.h)
-QT_CLASS_LIB(QtCleanUpFunction, QtCore, qcoreapplication.h)
-QT_CLASS_LIB(QEvent, QtCore, qcoreevent.h)
-QT_CLASS_LIB(QTimerEvent, QtCore, qcoreevent.h)
-QT_CLASS_LIB(QChildEvent, QtCore, qcoreevent.h)
-QT_CLASS_LIB(QCustomEvent, QtCore, qcoreevent.h)
-QT_CLASS_LIB(QDynamicPropertyChangeEvent, QtCore, qcoreevent.h)
-QT_CLASS_LIB(QEventLoop, QtCore, qeventloop.h)
-QT_CLASS_LIB(QMetaMethod, QtCore, qmetaobject.h)
-QT_CLASS_LIB(QMetaEnum, QtCore, qmetaobject.h)
-QT_CLASS_LIB(QMetaProperty, QtCore, qmetaobject.h)
-QT_CLASS_LIB(QMetaClassInfo, QtCore, qmetaobject.h)
-QT_CLASS_LIB(QMetaType, QtCore, qmetatype.h)
-QT_CLASS_LIB(QMetaTypeId, QtCore, qmetatype.h)
-QT_CLASS_LIB(QMetaTypeId2, QtCore, qmetatype.h)
-QT_CLASS_LIB(QMimeData, QtCore, qmimedata.h)
-QT_CLASS_LIB(QObjectList, QtCore, qobject.h)
-QT_CLASS_LIB(QObjectData, QtCore, qobject.h)
-QT_CLASS_LIB(QObject, QtCore, qobject.h)
-QT_CLASS_LIB(QObjectUserData, QtCore, qobject.h)
-QT_CLASS_LIB(QObjectCleanupHandler, QtCore, qobjectcleanuphandler.h)
-QT_CLASS_LIB(QGenericArgument, QtCore, qobjectdefs.h)
-QT_CLASS_LIB(QGenericReturnArgument, QtCore, qobjectdefs.h)
-QT_CLASS_LIB(QArgument, QtCore, qobjectdefs.h)
-QT_CLASS_LIB(QReturnArgument, QtCore, qobjectdefs.h)
-QT_CLASS_LIB(QMetaObject, QtCore, qobjectdefs.h)
-QT_CLASS_LIB(QMetaObjectAccessor, QtCore, qobjectdefs.h)
-QT_CLASS_LIB(QMetaObjectExtraData, QtCore, qobjectdefs.h)
-QT_CLASS_LIB(QPointer, QtCore, qpointer.h)
-QT_CLASS_LIB(QSharedMemory, QtCore, qsharedmemory.h)
-QT_CLASS_LIB(QSignalMapper, QtCore, qsignalmapper.h)
-QT_CLASS_LIB(QSocketNotifier, QtCore, qsocketnotifier.h)
-QT_CLASS_LIB(QSystemSemaphore, QtCore, qsystemsemaphore.h)
-QT_CLASS_LIB(QTimer, QtCore, qtimer.h)
-QT_CLASS_LIB(QTranslator, QtCore, qtranslator.h)
-QT_CLASS_LIB(QVariant, QtCore, qvariant.h)
-QT_CLASS_LIB(QVariantList, QtCore, qvariant.h)
-QT_CLASS_LIB(QVariantMap, QtCore, qvariant.h)
-QT_CLASS_LIB(QVariantHash, QtCore, qvariant.h)
-QT_CLASS_LIB(QVariantComparisonHelper, QtCore, qvariant.h)
-QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
-QT_CLASS_LIB(QFutureIterator, QtCore, qfuture.h)
-QT_CLASS_LIB(QMutableFutureIterator, QtCore, qfuture.h)
-QT_CLASS_LIB(QFuture, QtCore, qfuture.h)
-QT_CLASS_LIB(QFutureInterfaceBase, QtCore, qfutureinterface.h)
-QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h)
-QT_CLASS_LIB(QFutureInterface, QtCore, qfutureinterface.h)
-QT_CLASS_LIB(QFutureSynchronizer, QtCore, qfuturesynchronizer.h)
-QT_CLASS_LIB(QFutureWatcherBase, QtCore, qfuturewatcher.h)
-QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h)
-QT_CLASS_LIB(QFutureWatcher, QtCore, qfuturewatcher.h)
-QT_CLASS_LIB(QRunnable, QtCore, qrunnable.h)
-QT_CLASS_LIB(QtConcurrentFilter, QtCore, qtconcurrentfilter.h)
-QT_CLASS_LIB(QtConcurrentMap, QtCore, qtconcurrentmap.h)
-QT_CLASS_LIB(QtConcurrentRun, QtCore, qtconcurrentrun.h)
-QT_CLASS_LIB(QThreadPool, QtCore, qthreadpool.h)
-QT_CLASS_LIB(QFactoryInterface, QtCore, qfactoryinterface.h)
-QT_CLASS_LIB(QLibrary, QtCore, qlibrary.h)
-QT_CLASS_LIB(QtPlugin, QtCore, qplugin.h)
-QT_CLASS_LIB(QtPluginInstanceFunction, QtCore, qplugin.h)
-QT_CLASS_LIB(QPluginLoader, QtCore, qpluginloader.h)
-QT_CLASS_LIB(QUuid, QtCore, quuid.h)
-QT_CLASS_LIB(QAtomicInt, QtCore, qatomic.h)
-QT_CLASS_LIB(QAtomicPointer, QtCore, qatomic.h)
-QT_CLASS_LIB(QBasicAtomicInt, QtCore, qbasicatomic.h)
-QT_CLASS_LIB(QBasicAtomicPointer, QtCore, qbasicatomic.h)
-QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
-QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
-QT_CLASS_LIB(QMutex, QtCore, qmutex.h)
-QT_CLASS_LIB(QMutexLocker, QtCore, qmutex.h)
-QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
-QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
-QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
-QT_CLASS_LIB(QReadWriteLock, QtCore, qreadwritelock.h)
-QT_CLASS_LIB(QReadLocker, QtCore, qreadwritelock.h)
-QT_CLASS_LIB(QWriteLocker, QtCore, qreadwritelock.h)
-QT_CLASS_LIB(QSemaphore, QtCore, qsemaphore.h)
-QT_CLASS_LIB(QThread, QtCore, qthread.h)
-QT_CLASS_LIB(QThread, QtCore, qthread.h)
-QT_CLASS_LIB(QThreadStorageData, QtCore, qthreadstorage.h)
-QT_CLASS_LIB(QThreadStorage, QtCore, qthreadstorage.h)
-QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
-QT_CLASS_LIB(QWaitCondition, QtCore, qwaitcondition.h)
-QT_CLASS_LIB(QAbstractState, QtCore, qabstractstate.h)
-QT_CLASS_LIB(QAbstractTransition, QtCore, qabstracttransition.h)
-QT_CLASS_LIB(QEventTransition, QtCore, qeventtransition.h)
-QT_CLASS_LIB(QFinalState, QtCore, qfinalstate.h)
-QT_CLASS_LIB(QHistoryState, QtCore, qhistorystate.h)
-QT_CLASS_LIB(QSignalTransition, QtCore, qsignaltransition.h)
-QT_CLASS_LIB(QState, QtCore, qstate.h)
-QT_CLASS_LIB(QStateMachine, QtCore, qstatemachine.h)
-QT_CLASS_LIB(QAbstractAnimation, QtCore, qabstractanimation.h)
-QT_CLASS_LIB(QAnimationGroup, QtCore, qanimationgroup.h)
-QT_CLASS_LIB(QParallelAnimationGroup, QtCore, qparallelanimationgroup.h)
-QT_CLASS_LIB(QPauseAnimation, QtCore, qpauseanimation.h)
-QT_CLASS_LIB(QPropertyAnimation, QtCore, qpropertyanimation.h)
-QT_CLASS_LIB(QSequentialAnimationGroup, QtCore, qsequentialanimationgroup.h)
-QT_CLASS_LIB(QVariantAnimation, QtCore, qvariantanimation.h)
+QT_CLASS_LIB(QAbstractFileEngine, QtCore, qabstractfileengine.h)
+QT_CLASS_LIB(QAbstractFileEngineHandler, QtCore, qabstractfileengine.h)
+QT_CLASS_LIB(QAbstractFileEngineIterator, QtCore, qabstractfileengine.h)
+QT_CLASS_LIB(QBuffer, QtCore, qbuffer.h)
+QT_CLASS_LIB(QDataStream, QtCore, qdatastream.h)
+QT_CLASS_LIB(QtDebug, QtCore, qdebug.h)
+QT_CLASS_LIB(QDebug, QtCore, qdebug.h)
+QT_CLASS_LIB(QNoDebug, QtCore, qdebug.h)
+QT_CLASS_LIB(QDir, QtCore, qdir.h)
+QT_CLASS_LIB(QDirIterator, QtCore, qdiriterator.h)
+QT_CLASS_LIB(QFile, QtCore, qfile.h)
+QT_CLASS_LIB(QFileInfo, QtCore, qfileinfo.h)
+QT_CLASS_LIB(QFileInfoList, QtCore, qfileinfo.h)
+QT_CLASS_LIB(QFileInfoListIterator, QtCore, qfileinfo.h)
+QT_CLASS_LIB(QFileSystemWatcher, QtCore, qfilesystemwatcher.h)
+QT_CLASS_LIB(QFSFileEngine, QtCore, qfsfileengine.h)
+QT_CLASS_LIB(QIODevice, QtCore, qiodevice.h)
+QT_CLASS_LIB(Q_PID, QtCore, qprocess.h)
+QT_CLASS_LIB(QProcessEnvironment, QtCore, qprocess.h)
+QT_CLASS_LIB(QProcess, QtCore, qprocess.h)
+QT_CLASS_LIB(QResource, QtCore, qresource.h)
+QT_CLASS_LIB(QSettings, QtCore, qsettings.h)
+QT_CLASS_LIB(QTemporaryFile, QtCore, qtemporaryfile.h)
+QT_CLASS_LIB(QTextStream, QtCore, qtextstream.h)
+QT_CLASS_LIB(QTextStreamFunction, QtCore, qtextstream.h)
+QT_CLASS_LIB(QTextStreamManipulator, QtCore, qtextstream.h)
+QT_CLASS_LIB(QTS, QtCore, qtextstream.h)
+QT_CLASS_LIB(QTextIStream, QtCore, qtextstream.h)
+QT_CLASS_LIB(QTextOStream, QtCore, qtextstream.h)
+QT_CLASS_LIB(QUrl, QtCore, qurl.h)
 QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
 QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
 QT_CLASS_LIB(QMacCompatGLint, QtOpenGL, qgl.h)
@@ -322,20 +322,18 @@ QT_CLASS_LIB(QGLScreenSurfaceFunctions, 
 QT_CLASS_LIB(QGLScreen, QtOpenGL, qglscreen_qws.h)
 QT_CLASS_LIB(QGLShader, QtOpenGL, qglshaderprogram.h)
 QT_CLASS_LIB(QGLShaderProgram, QtOpenGL, qglshaderprogram.h)
-QT_CLASS_LIB(QXmlNamespaceSupport, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlAttributes, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlInputSource, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlParseException, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlReader, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlSimpleReader, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlLocator, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlContentHandler, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlErrorHandler, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlDTDHandler, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlEntityResolver, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlLexicalHandler, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlDeclHandler, QtXml, qxml.h)
-QT_CLASS_LIB(QXmlDefaultHandler, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlStreamAttribute, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamAttributes, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamEntityResolver, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamReader, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamStringRef, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlStreamWriter, QtXml, qxmlstream.h)
 QT_CLASS_LIB(QDomImplementation, QtXml, qdom.h)
 QT_CLASS_LIB(QDomNode, QtXml, qdom.h)
 QT_CLASS_LIB(QDomNodeList, QtXml, qdom.h)
@@ -353,18 +351,37 @@ QT_CLASS_LIB(QDomNotation, QtXml, qdom.h
 QT_CLASS_LIB(QDomEntity, QtXml, qdom.h)
 QT_CLASS_LIB(QDomEntityReference, QtXml, qdom.h)
 QT_CLASS_LIB(QDomProcessingInstruction, QtXml, qdom.h)
-QT_CLASS_LIB(QXmlStreamAttribute, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamAttributes, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamEntityDeclaration, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamEntityDeclarations, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamEntityResolver, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamNamespaceDeclaration, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamNamespaceDeclarations, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamNotationDeclaration, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamNotationDeclarations, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamReader, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamStringRef, QtXml, qxmlstream.h)
-QT_CLASS_LIB(QXmlStreamWriter, QtXml, qxmlstream.h)
+QT_CLASS_LIB(QXmlNamespaceSupport, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlAttributes, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlInputSource, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlParseException, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlReader, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlSimpleReader, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlLocator, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlContentHandler, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlErrorHandler, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlDTDHandler, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlEntityResolver, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlLexicalHandler, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlDeclHandler, QtXml, qxml.h)
+QT_CLASS_LIB(QXmlDefaultHandler, QtXml, qxml.h)
+QT_CLASS_LIB(QAbstractSocket, QtNetwork, qabstractsocket.h)
+QT_CLASS_LIB(QLocalServer, QtNetwork, qlocalserver.h)
+QT_CLASS_LIB(QLocalSocket, QtNetwork, qlocalsocket.h)
+QT_CLASS_LIB(QTcpServer, QtNetwork, qtcpserver.h)
+QT_CLASS_LIB(QTcpSocket, QtNetwork, qtcpsocket.h)
+QT_CLASS_LIB(QUdpSocket, QtNetwork, qudpsocket.h)
+QT_CLASS_LIB(QAuthenticator, QtNetwork, qauthenticator.h)
+QT_CLASS_LIB(QIPv6Address, QtNetwork, qhostaddress.h)
+QT_CLASS_LIB(Q_IPV6ADDR, QtNetwork, qhostaddress.h)
+QT_CLASS_LIB(QHostAddress, QtNetwork, qhostaddress.h)
+QT_CLASS_LIB(QHostInfo, QtNetwork, qhostinfo.h)
+QT_CLASS_LIB(QNetworkAddressEntry, QtNetwork, qnetworkinterface.h)
+QT_CLASS_LIB(QNetworkInterface, QtNetwork, qnetworkinterface.h)
+QT_CLASS_LIB(QNetworkProxyQuery, QtNetwork, qnetworkproxy.h)
+QT_CLASS_LIB(QNetworkProxy, QtNetwork, qnetworkproxy.h)
+QT_CLASS_LIB(QNetworkProxyFactory, QtNetwork, qnetworkproxy.h)
+QT_CLASS_LIB(QUrlInfo, QtNetwork, qurlinfo.h)
 QT_CLASS_LIB(QNetworkCacheMetaData, QtNetwork, qabstractnetworkcache.h)
 QT_CLASS_LIB(QAbstractNetworkCache, QtNetwork, qabstractnetworkcache.h)
 QT_CLASS_LIB(QFtp, QtNetwork, qftp.h)
@@ -378,23 +395,6 @@ QT_CLASS_LIB(QNetworkCookieJar, QtNetwor
 QT_CLASS_LIB(QNetworkDiskCache, QtNetwork, qnetworkdiskcache.h)
 QT_CLASS_LIB(QNetworkReply, QtNetwork, qnetworkreply.h)
 QT_CLASS_LIB(QNetworkRequest, QtNetwork, qnetworkrequest.h)
-QT_CLASS_LIB(QAuthenticator, QtNetwork, qauthenticator.h)
-QT_CLASS_LIB(QIPv6Address, QtNetwork, qhostaddress.h)
-QT_CLASS_LIB(Q_IPV6ADDR, QtNetwork, qhostaddress.h)
-QT_CLASS_LIB(QHostAddress, QtNetwork, qhostaddress.h)
-QT_CLASS_LIB(QHostInfo, QtNetwork, qhostinfo.h)
-QT_CLASS_LIB(QNetworkAddressEntry, QtNetwork, qnetworkinterface.h)
-QT_CLASS_LIB(QNetworkInterface, QtNetwork, qnetworkinterface.h)
-QT_CLASS_LIB(QNetworkProxyQuery, QtNetwork, qnetworkproxy.h)
-QT_CLASS_LIB(QNetworkProxy, QtNetwork, qnetworkproxy.h)
-QT_CLASS_LIB(QNetworkProxyFactory, QtNetwork, qnetworkproxy.h)
-QT_CLASS_LIB(QUrlInfo, QtNetwork, qurlinfo.h)
-QT_CLASS_LIB(QAbstractSocket, QtNetwork, qabstractsocket.h)
-QT_CLASS_LIB(QLocalServer, QtNetwork, qlocalserver.h)
-QT_CLASS_LIB(QLocalSocket, QtNetwork, qlocalsocket.h)
-QT_CLASS_LIB(QTcpServer, QtNetwork, qtcpserver.h)
-QT_CLASS_LIB(QTcpSocket, QtNetwork, qtcpsocket.h)
-QT_CLASS_LIB(QUdpSocket, QtNetwork, qudpsocket.h)
 QT_CLASS_LIB(QSsl, QtNetwork, qssl.h)
 QT_CLASS_LIB(QSslCertificate, QtNetwork, qsslcertificate.h)
 QT_CLASS_LIB(QSslCipher, QtNetwork, qsslcipher.h)
@@ -550,183 +550,24 @@ QT_CLASS_LIB(QSqlRelationalDelegate, QtS
 QT_CLASS_LIB(QSqlRelation, QtSql, qsqlrelationaltablemodel.h)
 QT_CLASS_LIB(QSqlRelationalTableModel, QtSql, qsqlrelationaltablemodel.h)
 QT_CLASS_LIB(QSqlTableModel, QtSql, qsqltablemodel.h)
-QT_CLASS_LIB(QSQLite2Result, QtSql, qsql_sqlite2.h)
-QT_CLASS_LIB(QSQLite2Driver, QtSql, qsql_sqlite2.h)
 QT_CLASS_LIB(QODBCResult, QtSql, qsql_odbc.h)
 QT_CLASS_LIB(QODBCDriver, QtSql, qsql_odbc.h)
-QT_CLASS_LIB(QTDSResult, QtSql, qsql_tds.h)
-QT_CLASS_LIB(QTDSDriver, QtSql, qsql_tds.h)
-QT_CLASS_LIB(QIBaseResult, QtSql, qsql_ibase.h)
-QT_CLASS_LIB(QIBaseDriver, QtSql, qsql_ibase.h)
-QT_CLASS_LIB(QSQLiteResult, QtSql, qsql_sqlite.h)
-QT_CLASS_LIB(QSQLiteDriver, QtSql, qsql_sqlite.h)
-QT_CLASS_LIB(QMYSQLResult, QtSql, qsql_mysql.h)
-QT_CLASS_LIB(QMYSQLDriver, QtSql, qsql_mysql.h)
+QT_CLASS_LIB(QDB2Result, QtSql, qsql_db2.h)
+QT_CLASS_LIB(QDB2Driver, QtSql, qsql_db2.h)
 QT_CLASS_LIB(QPSQLResult, QtSql, qsql_psql.h)
 QT_CLASS_LIB(QPSQLDriver, QtSql, qsql_psql.h)
+QT_CLASS_LIB(QSQLiteResult, QtSql, qsql_sqlite.h)
+QT_CLASS_LIB(QSQLiteDriver, QtSql, qsql_sqlite.h)
 QT_CLASS_LIB(QOCIResult, QtSql, qsql_oci.h)
 QT_CLASS_LIB(QOCIDriver, QtSql, qsql_oci.h)
-QT_CLASS_LIB(QDB2Result, QtSql, qsql_db2.h)
-QT_CLASS_LIB(QDB2Driver, QtSql, qsql_db2.h)
-QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h)
-QT_CLASS_LIB(QIcon, QtGui, qicon.h)
-QT_CLASS_LIB(QIconSet, QtGui, qicon.h)
-QT_CLASS_LIB(QIconEngine, QtGui, qiconengine.h)
-QT_CLASS_LIB(QIconEngineV2, QtGui, qiconengine.h)
-QT_CLASS_LIB(QIconEngineFactoryInterface, QtGui, qiconengineplugin.h)
-QT_CLASS_LIB(QIconEnginePlugin, QtGui, qiconengineplugin.h)
-QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtGui, qiconengineplugin.h)
-QT_CLASS_LIB(QIconEnginePluginV2, QtGui, qiconengineplugin.h)
-QT_CLASS_LIB(QImageTextKeyLang, QtGui, qimage.h)
-QT_CLASS_LIB(QImage, QtGui, qimage.h)
-QT_CLASS_LIB(QImageIOHandler, QtGui, qimageiohandler.h)
-QT_CLASS_LIB(QImageIOHandlerFactoryInterface, QtGui, qimageiohandler.h)
-QT_CLASS_LIB(QImageIOPlugin, QtGui, qimageiohandler.h)
-QT_CLASS_LIB(QImageReader, QtGui, qimagereader.h)
-QT_CLASS_LIB(QImageWriter, QtGui, qimagewriter.h)
-QT_CLASS_LIB(QMovie, QtGui, qmovie.h)
-QT_CLASS_LIB(QPicture, QtGui, qpicture.h)
-QT_CLASS_LIB(QPictureIO, QtGui, qpicture.h)
-QT_CLASS_LIB(QPictureFormatInterface, QtGui, qpictureformatplugin.h)
-QT_CLASS_LIB(QPictureFormatPlugin, QtGui, qpictureformatplugin.h)
-QT_CLASS_LIB(QPixmap, QtGui, qpixmap.h)
-QT_CLASS_LIB(QPixmapCache, QtGui, qpixmapcache.h)
-QT_CLASS_LIB(QS60MainApplication, QtGui, qs60mainapplication.h)
-QT_CLASS_LIB(QS60MainAppUi, QtGui, qs60mainappui.h)
-QT_CLASS_LIB(QS60MainDocument, QtGui, qs60maindocument.h)
-QT_CLASS_LIB(QCopChannel, QtGui, qcopchannel_qws.h)
-QT_CLASS_LIB(QDecorationAction, QtGui, qdecoration_qws.h)
-QT_CLASS_LIB(QDecoration, QtGui, qdecoration_qws.h)
-QT_CLASS_LIB(QDecorationDefault, QtGui, qdecorationdefault_qws.h)
-QT_CLASS_LIB(QDecorationFactory, QtGui, qdecorationfactory_qws.h)
-QT_CLASS_LIB(QDecorationFactoryInterface, QtGui, qdecorationplugin_qws.h)
-QT_CLASS_LIB(QDecorationPlugin, QtGui, qdecorationplugin_qws.h)
-QT_CLASS_LIB(QDecorationStyled, QtGui, qdecorationstyled_qws.h)
-QT_CLASS_LIB(QDecorationWindows, QtGui, qdecorationwindows_qws.h)
-QT_CLASS_LIB(QDirectPainter, QtGui, qdirectpainter_qws.h)
-QT_CLASS_LIB(QWSKeyboardHandler, QtGui, qkbd_qws.h)
-QT_CLASS_LIB(QKbdDriverFactory, QtGui, qkbddriverfactory_qws.h)
-QT_CLASS_LIB(QWSKeyboardHandlerFactoryInterface, QtGui, qkbddriverplugin_qws.h)
-QT_CLASS_LIB(QKbdDriverPlugin, QtGui, qkbddriverplugin_qws.h)
-QT_CLASS_LIB(QWSLinuxInputKeyboardHandler, QtGui, qkbdlinuxinput_qws.h)
-QT_CLASS_LIB(QWSQnxKeyboardHandler, QtGui, qkbdqnx_qws.h)
-QT_CLASS_LIB(QWSTtyKeyboardHandler, QtGui, qkbdtty_qws.h)
-QT_CLASS_LIB(QWSUmKeyboardHandler, QtGui, qkbdum_qws.h)
-QT_CLASS_LIB(QVFbKeyboardHandler, QtGui, qkbdvfb_qws.h)
-QT_CLASS_LIB(QWSPointerCalibrationData, QtGui, qmouse_qws.h)
-QT_CLASS_LIB(QWSMouseHandler, QtGui, qmouse_qws.h)
-QT_CLASS_LIB(QWSCalibratedMouseHandler, QtGui, qmouse_qws.h)
-QT_CLASS_LIB(QMouseDriverFactory, QtGui, qmousedriverfactory_qws.h)
-QT_CLASS_LIB(QWSMouseHandlerFactoryInterface, QtGui, qmousedriverplugin_qws.h)
-QT_CLASS_LIB(QMouseDriverPlugin, QtGui, qmousedriverplugin_qws.h)
-QT_CLASS_LIB(QWSLinuxInputMouseHandler, QtGui, qmouselinuxinput_qws.h)
-QT_CLASS_LIB(QWSLinuxTPMouseHandler, QtGui, qmouselinuxtp_qws.h)
-QT_CLASS_LIB(QWSPcMouseHandler, QtGui, qmousepc_qws.h)
-QT_CLASS_LIB(QQnxMouseHandler, QtGui, qmouseqnx_qws.h)
-QT_CLASS_LIB(QWSTslibMouseHandler, QtGui, qmousetslib_qws.h)
-QT_CLASS_LIB(QVFbMouseHandler, QtGui, qmousevfb_qws.h)
-QT_CLASS_LIB(QScreenCursor, QtGui, qscreen_qws.h)
-QT_CLASS_LIB(QPoolEntry, QtGui, qscreen_qws.h)
-QT_CLASS_LIB(QScreen, QtGui, qscreen_qws.h)
-QT_CLASS_LIB(QScreenDriverFactory, QtGui, qscreendriverfactory_qws.h)
-QT_CLASS_LIB(QScreenDriverFactoryInterface, QtGui, qscreendriverplugin_qws.h)
-QT_CLASS_LIB(QScreenDriverPlugin, QtGui, qscreendriverplugin_qws.h)
-QT_CLASS_LIB(QLinuxFb_Shared, QtGui, qscreenlinuxfb_qws.h)
-QT_CLASS_LIB(QLinuxFbScreen, QtGui, qscreenlinuxfb_qws.h)
-QT_CLASS_LIB(QProxyScreenCursor, QtGui, qscreenproxy_qws.h)
-QT_CLASS_LIB(QProxyScreen, QtGui, qscreenproxy_qws.h)
-QT_CLASS_LIB(QQnxScreen, QtGui, qscreenqnx_qws.h)
-QT_CLASS_LIB(QTransformedScreen, QtGui, qscreentransformed_qws.h)
-QT_CLASS_LIB(QVFbScreen, QtGui, qscreenvfb_qws.h)
-QT_CLASS_LIB(QWSSoundServer, QtGui, qsoundqss_qws.h)
-QT_CLASS_LIB(QWSSoundClient, QtGui, qsoundqss_qws.h)
-QT_CLASS_LIB(QWSSoundServerSocket, QtGui, qsoundqss_qws.h)
-QT_CLASS_LIB(QTransportAuth, QtGui, qtransportauth_qws.h)
-QT_CLASS_LIB(QAuthDevice, QtGui, qtransportauth_qws.h)
-QT_CLASS_LIB(QVFbHeader, QtGui, qvfbhdr.h)
-QT_CLASS_LIB(QVFbKeyData, QtGui, qvfbhdr.h)
-QT_CLASS_LIB(QWSInternalWindowInfo, QtGui, qwindowsystem_qws.h)
-QT_CLASS_LIB(QWSScreenSaver, QtGui, qwindowsystem_qws.h)
-QT_CLASS_LIB(QWSWindow, QtGui, qwindowsystem_qws.h)
-QT_CLASS_LIB(QWSSoundServer, QtGui, qwindowsystem_qws.h)
-QT_CLASS_LIB(QWSServer, QtGui, qwindowsystem_qws.h)
-QT_CLASS_LIB(QWSInputMethod, QtGui, qwindowsystem_qws.h)
-QT_CLASS_LIB(QWSCursorMap, QtGui, qwindowsystem_qws.h)
-QT_CLASS_LIB(QWSClient, QtGui, qwindowsystem_qws.h)
-QT_CLASS_LIB(QWSCursor, QtGui, qwscursor_qws.h)
-QT_CLASS_LIB(QWSWindowInfo, QtGui, qwsdisplay_qws.h)
-QT_CLASS_LIB(QWSDisplay, QtGui, qwsdisplay_qws.h)
-QT_CLASS_LIB(QWSEmbedWidget, QtGui, qwsembedwidget.h)
-QT_CLASS_LIB(QWSEvent, QtGui, qwsevent_qws.h)
-QT_CLASS_LIB(QWSManager, QtGui, qwsmanager_qws.h)
-QT_CLASS_LIB(QWSPropertyManager, QtGui, qwsproperty_qws.h)
-QT_CLASS_LIB(QWSProtocolItem, QtGui, qwsprotocolitem_qws.h)
-QT_CLASS_LIB(QWSSocket, QtGui, qwssocket_qws.h)
-QT_CLASS_LIB(QWSServerSocket, QtGui, qwssocket_qws.h)
-QT_CLASS_LIB(QAbstractButton, QtGui, qabstractbutton.h)
-QT_CLASS_LIB(QAbstractScrollArea, QtGui, qabstractscrollarea.h)
-QT_CLASS_LIB(QAbstractSlider, QtGui, qabstractslider.h)
-QT_CLASS_LIB(QAbstractSpinBox, QtGui, qabstractspinbox.h)
-QT_CLASS_LIB(QButtonGroup, QtGui, qbuttongroup.h)
-QT_CLASS_LIB(QCalendarWidget, QtGui, qcalendarwidget.h)
-QT_CLASS_LIB(QCheckBox, QtGui, qcheckbox.h)
-QT_CLASS_LIB(QComboBox, QtGui, qcombobox.h)
-QT_CLASS_LIB(QCommandLinkButton, QtGui, qcommandlinkbutton.h)
-QT_CLASS_LIB(QDateTimeEdit, QtGui, qdatetimeedit.h)
-QT_CLASS_LIB(QTimeEdit, QtGui, qdatetimeedit.h)
-QT_CLASS_LIB(QDateEdit, QtGui, qdatetimeedit.h)
-QT_CLASS_LIB(QDial, QtGui, qdial.h)
-QT_CLASS_LIB(QDialogButtonBox, QtGui, qdialogbuttonbox.h)
-QT_CLASS_LIB(QDockWidget, QtGui, qdockwidget.h)
-QT_CLASS_LIB(QFocusFrame, QtGui, qfocusframe.h)
-QT_CLASS_LIB(QFontComboBox, QtGui, qfontcombobox.h)
-QT_CLASS_LIB(QFrame, QtGui, qframe.h)
-QT_CLASS_LIB(QGroupBox, QtGui, qgroupbox.h)
-QT_CLASS_LIB(QLabel, QtGui, qlabel.h)
-QT_CLASS_LIB(QLCDNumber, QtGui, qlcdnumber.h)
-QT_CLASS_LIB(QLineEdit, QtGui, qlineedit.h)
-QT_CLASS_LIB(QMacCocoaViewContainer, QtGui, qmaccocoaviewcontainer_mac.h)
-QT_CLASS_LIB(QMacNativeWidget, QtGui, qmacnativewidget_mac.h)
-QT_CLASS_LIB(QMainWindow, QtGui, qmainwindow.h)
-QT_CLASS_LIB(QMdiArea, QtGui, qmdiarea.h)
-QT_CLASS_LIB(QMdiSubWindow, QtGui, qmdisubwindow.h)
-QT_CLASS_LIB(QMenu, QtGui, qmenu.h)
-QT_CLASS_LIB(QMenuBar, QtGui, qmenubar.h)
-QT_CLASS_LIB(QMenuItem, QtGui, qmenudata.h)
-QT_CLASS_LIB(QPlainTextEdit, QtGui, qplaintextedit.h)
-QT_CLASS_LIB(QPlainTextDocumentLayout, QtGui, qplaintextedit.h)
-QT_CLASS_LIB(QPrintPreviewWidget, QtGui, qprintpreviewwidget.h)
-QT_CLASS_LIB(QProgressBar, QtGui, qprogressbar.h)
-QT_CLASS_LIB(QPushButton, QtGui, qpushbutton.h)
-QT_CLASS_LIB(QRadioButton, QtGui, qradiobutton.h)
-QT_CLASS_LIB(QRubberBand, QtGui, qrubberband.h)
-QT_CLASS_LIB(QScrollArea, QtGui, qscrollarea.h)
-QT_CLASS_LIB(QScrollBar, QtGui, qscrollbar.h)
-QT_CLASS_LIB(QSizeGrip, QtGui, qsizegrip.h)
-QT_CLASS_LIB(QSlider, QtGui, qslider.h)
-QT_CLASS_LIB(QSpinBox, QtGui, qspinbox.h)
-QT_CLASS_LIB(QDoubleSpinBox, QtGui, qspinbox.h)
-QT_CLASS_LIB(QSplashScreen, QtGui, qsplashscreen.h)
-QT_CLASS_LIB(QSplitter, QtGui, qsplitter.h)
-QT_CLASS_LIB(QSplitterHandle, QtGui, qsplitter.h)
-QT_CLASS_LIB(QStackedWidget, QtGui, qstackedwidget.h)
-QT_CLASS_LIB(QStatusBar, QtGui, qstatusbar.h)
-QT_CLASS_LIB(QTabBar, QtGui, qtabbar.h)
-QT_CLASS_LIB(QTabWidget, QtGui, qtabwidget.h)
-QT_CLASS_LIB(QTextBrowser, QtGui, qtextbrowser.h)
-QT_CLASS_LIB(QTextEdit, QtGui, qtextedit.h)
-QT_CLASS_LIB(QToolBar, QtGui, qtoolbar.h)
-QT_CLASS_LIB(QToolBox, QtGui, qtoolbox.h)
-QT_CLASS_LIB(QToolButton, QtGui, qtoolbutton.h)
-QT_CLASS_LIB(QValidator, QtGui, qvalidator.h)
-QT_CLASS_LIB(QIntValidator, QtGui, qvalidator.h)
-QT_CLASS_LIB(QDoubleValidator, QtGui, qvalidator.h)
-QT_CLASS_LIB(QRegExpValidator, QtGui, qvalidator.h)
-QT_CLASS_LIB(QWorkspace, QtGui, qworkspace.h)
-QT_CLASS_LIB(QInputContext, QtGui, qinputcontext.h)
-QT_CLASS_LIB(QInputContextFactory, QtGui, qinputcontextfactory.h)
-QT_CLASS_LIB(QInputContextFactoryInterface, QtGui, qinputcontextplugin.h)
-QT_CLASS_LIB(QInputContextPlugin, QtGui, qinputcontextplugin.h)
+QT_CLASS_LIB(QIBaseResult, QtSql, qsql_ibase.h)
+QT_CLASS_LIB(QIBaseDriver, QtSql, qsql_ibase.h)
+QT_CLASS_LIB(QMYSQLResult, QtSql, qsql_mysql.h)
+QT_CLASS_LIB(QMYSQLDriver, QtSql, qsql_mysql.h)
+QT_CLASS_LIB(QTDSResult, QtSql, qsql_tds.h)
+QT_CLASS_LIB(QTDSDriver, QtSql, qsql_tds.h)
+QT_CLASS_LIB(QSQLite2Result, QtSql, qsql_sqlite2.h)
+QT_CLASS_LIB(QSQLite2Driver, QtSql, qsql_sqlite2.h)
 QT_CLASS_LIB(QGraphicsAnchor, QtGui, qgraphicsanchorlayout.h)
 QT_CLASS_LIB(QGraphicsAnchorLayout, QtGui, qgraphicsanchorlayout.h)
 QT_CLASS_LIB(QGraphicsGridLayout, QtGui, qgraphicsgridlayout.h)
@@ -762,20 +603,8 @@ QT_CLASS_LIB(QGraphicsScale, QtGui, qgra
 QT_CLASS_LIB(QGraphicsRotation, QtGui, qgraphicstransform.h)
 QT_CLASS_LIB(QGraphicsView, QtGui, qgraphicsview.h)
 QT_CLASS_LIB(QGraphicsWidget, QtGui, qgraphicswidget.h)
-QT_CLASS_LIB(QGenericMatrix, QtGui, qgenericmatrix.h)
-QT_CLASS_LIB(QMatrix2x2, QtGui, qgenericmatrix.h)
-QT_CLASS_LIB(QMatrix2x3, QtGui, qgenericmatrix.h)
-QT_CLASS_LIB(QMatrix2x4, QtGui, qgenericmatrix.h)
-QT_CLASS_LIB(QMatrix3x2, QtGui, qgenericmatrix.h)
-QT_CLASS_LIB(QMatrix3x3, QtGui, qgenericmatrix.h)
-QT_CLASS_LIB(QMatrix3x4, QtGui, qgenericmatrix.h)
-QT_CLASS_LIB(QMatrix4x2, QtGui, qgenericmatrix.h)
-QT_CLASS_LIB(QMatrix4x3, QtGui, qgenericmatrix.h)
-QT_CLASS_LIB(QMatrix4x4, QtGui, qmatrix4x4.h)
-QT_CLASS_LIB(QQuaternion, QtGui, qquaternion.h)
-QT_CLASS_LIB(QVector2D, QtGui, qvector2d.h)
-QT_CLASS_LIB(QVector3D, QtGui, qvector3d.h)
-QT_CLASS_LIB(QVector4D, QtGui, qvector4d.h)
+QT_CLASS_LIB(QKeyEventTransition, QtGui, qkeyeventtransition.h)
+QT_CLASS_LIB(QMouseEventTransition, QtGui, qmouseeventtransition.h)
 QT_CLASS_LIB(QFontEngineInfo, QtGui, qabstractfontengine_qws.h)
 QT_CLASS_LIB(QFontEngineFactoryInterface, QtGui, qabstractfontengine_qws.h)
 QT_CLASS_LIB(QFontEnginePlugin, QtGui, qabstractfontengine_qws.h)
@@ -816,45 +645,66 @@ QT_CLASS_LIB(QTextFragment, QtGui, qtext
 QT_CLASS_LIB(QTextOption, QtGui, qtextoption.h)
 QT_CLASS_LIB(QTextTableCell, QtGui, qtexttable.h)
 QT_CLASS_LIB(QTextTable, QtGui, qtexttable.h)
-QT_CLASS_LIB(QAbstractPageSetupDialog, QtGui, qabstractpagesetupdialog.h)
-QT_CLASS_LIB(QAbstractPrintDialog, QtGui, qabstractprintdialog.h)
-QT_CLASS_LIB(QColorDialog, QtGui, qcolordialog.h)
-QT_CLASS_LIB(QDialog, QtGui, qdialog.h)
-QT_CLASS_LIB(QErrorMessage, QtGui, qerrormessage.h)
-QT_CLASS_LIB(QFileDialog, QtGui, qfiledialog.h)
-QT_CLASS_LIB(QFileSystemModel, QtGui, qfilesystemmodel.h)
-QT_CLASS_LIB(QFontDialog, QtGui, qfontdialog.h)
-QT_CLASS_LIB(QInputDialog, QtGui, qinputdialog.h)
-QT_CLASS_LIB(QMessageBox, QtGui, qmessagebox.h)
-QT_CLASS_LIB(QPageSetupDialog, QtGui, qpagesetupdialog.h)
-QT_CLASS_LIB(QUnixPrintWidget, QtGui, qprintdialog.h)
-QT_CLASS_LIB(QPrintDialog, QtGui, qprintdialog.h)
-QT_CLASS_LIB(QPrintPreviewDialog, QtGui, qprintpreviewdialog.h)
-QT_CLASS_LIB(QProgressDialog, QtGui, qprogressdialog.h)
-QT_CLASS_LIB(QWizard, QtGui, qwizard.h)
-QT_CLASS_LIB(QWizardPage, QtGui, qwizard.h)
-QT_CLASS_LIB(QAccessible, QtGui, qaccessible.h)
-QT_CLASS_LIB(QAccessibleInterface, QtGui, qaccessible.h)
-QT_CLASS_LIB(QAccessibleInterfaceEx, QtGui, qaccessible.h)
-QT_CLASS_LIB(QAccessibleEvent, QtGui, qaccessible.h)
-QT_CLASS_LIB(QAccessible2Interface, QtGui, qaccessible2.h)
-QT_CLASS_LIB(QAccessibleTextInterface, QtGui, qaccessible2.h)
-QT_CLASS_LIB(QAccessibleEditableTextInterface, QtGui, qaccessible2.h)
-QT_CLASS_LIB(QAccessibleSimpleEditableTextInterface, QtGui, qaccessible2.h)
-QT_CLASS_LIB(QAccessibleValueInterface, QtGui, qaccessible2.h)
-QT_CLASS_LIB(QAccessibleTableInterface, QtGui, qaccessible2.h)
-QT_CLASS_LIB(QAccessibleActionInterface, QtGui, qaccessible2.h)
-QT_CLASS_LIB(QAccessibleImageInterface, QtGui, qaccessible2.h)
-QT_CLASS_LIB(QAccessibleBridge, QtGui, qaccessiblebridge.h)
-QT_CLASS_LIB(QAccessibleBridgeFactoryInterface, QtGui, qaccessiblebridge.h)
-QT_CLASS_LIB(QAccessibleBridgePlugin, QtGui, qaccessiblebridge.h)
-QT_CLASS_LIB(QAccessibleObject, QtGui, qaccessibleobject.h)
-QT_CLASS_LIB(QAccessibleObjectEx, QtGui, qaccessibleobject.h)
-QT_CLASS_LIB(QAccessibleApplication, QtGui, qaccessibleobject.h)
-QT_CLASS_LIB(QAccessibleFactoryInterface, QtGui, qaccessibleplugin.h)
-QT_CLASS_LIB(QAccessiblePlugin, QtGui, qaccessibleplugin.h)
-QT_CLASS_LIB(QAccessibleWidget, QtGui, qaccessiblewidget.h)
-QT_CLASS_LIB(QAccessibleWidgetEx, QtGui, qaccessiblewidget.h)
+QT_CLASS_LIB(QAbstractButton, QtGui, qabstractbutton.h)
+QT_CLASS_LIB(QAbstractScrollArea, QtGui, qabstractscrollarea.h)
+QT_CLASS_LIB(QAbstractSlider, QtGui, qabstractslider.h)
+QT_CLASS_LIB(QAbstractSpinBox, QtGui, qabstractspinbox.h)
+QT_CLASS_LIB(QButtonGroup, QtGui, qbuttongroup.h)
+QT_CLASS_LIB(QCalendarWidget, QtGui, qcalendarwidget.h)
+QT_CLASS_LIB(QCheckBox, QtGui, qcheckbox.h)
+QT_CLASS_LIB(QComboBox, QtGui, qcombobox.h)
+QT_CLASS_LIB(QCommandLinkButton, QtGui, qcommandlinkbutton.h)
+QT_CLASS_LIB(QDateTimeEdit, QtGui, qdatetimeedit.h)
+QT_CLASS_LIB(QTimeEdit, QtGui, qdatetimeedit.h)
+QT_CLASS_LIB(QDateEdit, QtGui, qdatetimeedit.h)
+QT_CLASS_LIB(QDial, QtGui, qdial.h)
+QT_CLASS_LIB(QDialogButtonBox, QtGui, qdialogbuttonbox.h)
+QT_CLASS_LIB(QDockWidget, QtGui, qdockwidget.h)
+QT_CLASS_LIB(QFocusFrame, QtGui, qfocusframe.h)
+QT_CLASS_LIB(QFontComboBox, QtGui, qfontcombobox.h)
+QT_CLASS_LIB(QFrame, QtGui, qframe.h)
+QT_CLASS_LIB(QGroupBox, QtGui, qgroupbox.h)
+QT_CLASS_LIB(QLabel, QtGui, qlabel.h)
+QT_CLASS_LIB(QLCDNumber, QtGui, qlcdnumber.h)
+QT_CLASS_LIB(QLineEdit, QtGui, qlineedit.h)
+QT_CLASS_LIB(QMacCocoaViewContainer, QtGui, qmaccocoaviewcontainer_mac.h)
+QT_CLASS_LIB(QMacNativeWidget, QtGui, qmacnativewidget_mac.h)
+QT_CLASS_LIB(QMainWindow, QtGui, qmainwindow.h)
+QT_CLASS_LIB(QMdiArea, QtGui, qmdiarea.h)
+QT_CLASS_LIB(QMdiSubWindow, QtGui, qmdisubwindow.h)
+QT_CLASS_LIB(QMenu, QtGui, qmenu.h)
+QT_CLASS_LIB(QMenuBar, QtGui, qmenubar.h)
+QT_CLASS_LIB(QMenuItem, QtGui, qmenudata.h)
+QT_CLASS_LIB(QPlainTextEdit, QtGui, qplaintextedit.h)
+QT_CLASS_LIB(QPlainTextDocumentLayout, QtGui, qplaintextedit.h)
+QT_CLASS_LIB(QPrintPreviewWidget, QtGui, qprintpreviewwidget.h)
+QT_CLASS_LIB(QProgressBar, QtGui, qprogressbar.h)
+QT_CLASS_LIB(QPushButton, QtGui, qpushbutton.h)
+QT_CLASS_LIB(QRadioButton, QtGui, qradiobutton.h)
+QT_CLASS_LIB(QRubberBand, QtGui, qrubberband.h)
+QT_CLASS_LIB(QScrollArea, QtGui, qscrollarea.h)
+QT_CLASS_LIB(QScrollBar, QtGui, qscrollbar.h)
+QT_CLASS_LIB(QSizeGrip, QtGui, qsizegrip.h)
+QT_CLASS_LIB(QSlider, QtGui, qslider.h)
+QT_CLASS_LIB(QSpinBox, QtGui, qspinbox.h)
+QT_CLASS_LIB(QDoubleSpinBox, QtGui, qspinbox.h)
+QT_CLASS_LIB(QSplashScreen, QtGui, qsplashscreen.h)
+QT_CLASS_LIB(QSplitter, QtGui, qsplitter.h)
+QT_CLASS_LIB(QSplitterHandle, QtGui, qsplitter.h)
+QT_CLASS_LIB(QStackedWidget, QtGui, qstackedwidget.h)
+QT_CLASS_LIB(QStatusBar, QtGui, qstatusbar.h)
+QT_CLASS_LIB(QTabBar, QtGui, qtabbar.h)
+QT_CLASS_LIB(QTabWidget, QtGui, qtabwidget.h)
+QT_CLASS_LIB(QTextBrowser, QtGui, qtextbrowser.h)
+QT_CLASS_LIB(QTextEdit, QtGui, qtextedit.h)
+QT_CLASS_LIB(QToolBar, QtGui, qtoolbar.h)
+QT_CLASS_LIB(QToolBox, QtGui, qtoolbox.h)
+QT_CLASS_LIB(QToolButton, QtGui, qtoolbutton.h)
+QT_CLASS_LIB(QValidator, QtGui, qvalidator.h)
+QT_CLASS_LIB(QIntValidator, QtGui, qvalidator.h)
+QT_CLASS_LIB(QDoubleValidator, QtGui, qvalidator.h)
+QT_CLASS_LIB(QRegExpValidator, QtGui, qvalidator.h)
+QT_CLASS_LIB(QWorkspace, QtGui, qworkspace.h)
 QT_CLASS_LIB(QAction, QtGui, qaction.h)
 QT_CLASS_LIB(QActionGroup, QtGui, qactiongroup.h)
 QT_CLASS_LIB(QApplication, QtGui, qapplication.h)
@@ -941,39 +791,6 @@ QT_CLASS_LIB(QWidgetSet, QtGui, qwindowd
 QT_CLASS_LIB(QX11EmbedWidget, QtGui, qx11embed_x11.h)
 QT_CLASS_LIB(QX11EmbedContainer, QtGui, qx11embed_x11.h)
 QT_CLASS_LIB(QX11Info, QtGui, qx11info_x11.h)
-QT_CLASS_LIB(QAbstractItemDelegate, QtGui, qabstractitemdelegate.h)
-QT_CLASS_LIB(QAbstractItemView, QtGui, qabstractitemview.h)
-QT_CLASS_LIB(QAbstractProxyModel, QtGui, qabstractproxymodel.h)
-QT_CLASS_LIB(QColumnView, QtGui, qcolumnview.h)
-QT_CLASS_LIB(QDataWidgetMapper, QtGui, qdatawidgetmapper.h)
-QT_CLASS_LIB(QDirModel, QtGui, qdirmodel.h)
-QT_CLASS_LIB(QFileIconProvider, QtGui, qfileiconprovider.h)
-QT_CLASS_LIB(QHeaderView, QtGui, qheaderview.h)
-QT_CLASS_LIB(QItemDelegate, QtGui, qitemdelegate.h)
-QT_CLASS_LIB(QItemEditorCreatorBase, QtGui, qitemeditorfactory.h)
-QT_CLASS_LIB(QItemEditorCreator, QtGui, qitemeditorfactory.h)
-QT_CLASS_LIB(QStandardItemEditorCreator, QtGui, qitemeditorfactory.h)
-QT_CLASS_LIB(QItemEditorFactory, QtGui, qitemeditorfactory.h)
-QT_CLASS_LIB(QItemSelectionRange, QtGui, qitemselectionmodel.h)
-QT_CLASS_LIB(QItemSelectionModel, QtGui, qitemselectionmodel.h)
-QT_CLASS_LIB(QItemSelection, QtGui, qitemselectionmodel.h)
-QT_CLASS_LIB(QListView, QtGui, qlistview.h)
-QT_CLASS_LIB(QListWidgetItem, QtGui, qlistwidget.h)
-QT_CLASS_LIB(QListWidget, QtGui, qlistwidget.h)
-QT_CLASS_LIB(QProxyModel, QtGui, qproxymodel.h)
-QT_CLASS_LIB(QSortFilterProxyModel, QtGui, qsortfilterproxymodel.h)
-QT_CLASS_LIB(QStandardItem, QtGui, qstandarditemmodel.h)
-QT_CLASS_LIB(QStandardItemModel, QtGui, qstandarditemmodel.h)
-QT_CLASS_LIB(QStringListModel, QtGui, qstringlistmodel.h)
-QT_CLASS_LIB(QStyledItemDelegate, QtGui, qstyleditemdelegate.h)
-QT_CLASS_LIB(QTableView, QtGui, qtableview.h)
-QT_CLASS_LIB(QTableWidgetSelectionRange, QtGui, qtablewidget.h)
-QT_CLASS_LIB(QTableWidgetItem, QtGui, qtablewidget.h)
-QT_CLASS_LIB(QTableWidget, QtGui, qtablewidget.h)
-QT_CLASS_LIB(QTreeView, QtGui, qtreeview.h)
-QT_CLASS_LIB(QTreeWidgetItem, QtGui, qtreewidget.h)
-QT_CLASS_LIB(QTreeWidget, QtGui, qtreewidget.h)
-QT_CLASS_LIB(QTreeWidgetItemIterator, QtGui, qtreewidgetitemiterator.h)
 QT_CLASS_LIB(QBrush, QtGui, qbrush.h)
 QT_CLASS_LIB(QBrushData, QtGui, qbrush.h)
 QT_CLASS_LIB(QGradientStop, QtGui, qbrush.h)
@@ -1066,13 +883,196 @@ QT_CLASS_LIB(QWindowsMobileStyle, QtGui,
 QT_CLASS_LIB(QWindowsStyle, QtGui, qwindowsstyle.h)
 QT_CLASS_LIB(QWindowsVistaStyle, QtGui, qwindowsvistastyle.h)
 QT_CLASS_LIB(QWindowsXPStyle, QtGui, qwindowsxpstyle.h)
-QT_CLASS_LIB(QKeyEventTransition, QtGui, qkeyeventtransition.h)
-QT_CLASS_LIB(QMouseEventTransition, QtGui, qmouseeventtransition.h)
+QT_CLASS_LIB(QGenericMatrix, QtGui, qgenericmatrix.h)
+QT_CLASS_LIB(QMatrix2x2, QtGui, qgenericmatrix.h)
+QT_CLASS_LIB(QMatrix2x3, QtGui, qgenericmatrix.h)
+QT_CLASS_LIB(QMatrix2x4, QtGui, qgenericmatrix.h)
+QT_CLASS_LIB(QMatrix3x2, QtGui, qgenericmatrix.h)
+QT_CLASS_LIB(QMatrix3x3, QtGui, qgenericmatrix.h)
+QT_CLASS_LIB(QMatrix3x4, QtGui, qgenericmatrix.h)
+QT_CLASS_LIB(QMatrix4x2, QtGui, qgenericmatrix.h)
+QT_CLASS_LIB(QMatrix4x3, QtGui, qgenericmatrix.h)
+QT_CLASS_LIB(QMatrix4x4, QtGui, qmatrix4x4.h)
+QT_CLASS_LIB(QQuaternion, QtGui, qquaternion.h)
+QT_CLASS_LIB(QVector2D, QtGui, qvector2d.h)
+QT_CLASS_LIB(QVector3D, QtGui, qvector3d.h)
+QT_CLASS_LIB(QVector4D, QtGui, qvector4d.h)
+QT_CLASS_LIB(QInputContext, QtGui, qinputcontext.h)
+QT_CLASS_LIB(QInputContextFactory, QtGui, qinputcontextfactory.h)
+QT_CLASS_LIB(QInputContextFactoryInterface, QtGui, qinputcontextplugin.h)
+QT_CLASS_LIB(QInputContextPlugin, QtGui, qinputcontextplugin.h)
 QT_CLASS_LIB(QGraphicsEffect, QtGui, qgraphicseffect.h)
 QT_CLASS_LIB(QGraphicsColorizeEffect, QtGui, qgraphicseffect.h)
 QT_CLASS_LIB(QGraphicsBlurEffect, QtGui, qgraphicseffect.h)
 QT_CLASS_LIB(QGraphicsDropShadowEffect, QtGui, qgraphicseffect.h)
 QT_CLASS_LIB(QGraphicsOpacityEffect, QtGui, qgraphicseffect.h)
+QT_CLASS_LIB(QS60MainApplication, QtGui, qs60mainapplication.h)
+QT_CLASS_LIB(QS60MainAppUi, QtGui, qs60mainappui.h)
+QT_CLASS_LIB(QS60MainDocument, QtGui, qs60maindocument.h)
+QT_CLASS_LIB(QCopChannel, QtGui, qcopchannel_qws.h)
+QT_CLASS_LIB(QDecorationAction, QtGui, qdecoration_qws.h)
+QT_CLASS_LIB(QDecoration, QtGui, qdecoration_qws.h)
+QT_CLASS_LIB(QDecorationDefault, QtGui, qdecorationdefault_qws.h)
+QT_CLASS_LIB(QDecorationFactory, QtGui, qdecorationfactory_qws.h)
+QT_CLASS_LIB(QDecorationFactoryInterface, QtGui, qdecorationplugin_qws.h)
+QT_CLASS_LIB(QDecorationPlugin, QtGui, qdecorationplugin_qws.h)
+QT_CLASS_LIB(QDecorationStyled, QtGui, qdecorationstyled_qws.h)
+QT_CLASS_LIB(QDecorationWindows, QtGui, qdecorationwindows_qws.h)
+QT_CLASS_LIB(QDirectPainter, QtGui, qdirectpainter_qws.h)
+QT_CLASS_LIB(QWSKeyboardHandler, QtGui, qkbd_qws.h)
+QT_CLASS_LIB(QKbdDriverFactory, QtGui, qkbddriverfactory_qws.h)
+QT_CLASS_LIB(QWSKeyboardHandlerFactoryInterface, QtGui, qkbddriverplugin_qws.h)
+QT_CLASS_LIB(QKbdDriverPlugin, QtGui, qkbddriverplugin_qws.h)
+QT_CLASS_LIB(QWSLinuxInputKeyboardHandler, QtGui, qkbdlinuxinput_qws.h)
+QT_CLASS_LIB(QWSQnxKeyboardHandler, QtGui, qkbdqnx_qws.h)
+QT_CLASS_LIB(QWSTtyKeyboardHandler, QtGui, qkbdtty_qws.h)
+QT_CLASS_LIB(QWSUmKeyboardHandler, QtGui, qkbdum_qws.h)
+QT_CLASS_LIB(QVFbKeyboardHandler, QtGui, qkbdvfb_qws.h)
+QT_CLASS_LIB(QWSPointerCalibrationData, QtGui, qmouse_qws.h)
+QT_CLASS_LIB(QWSMouseHandler, QtGui, qmouse_qws.h)
+QT_CLASS_LIB(QWSCalibratedMouseHandler, QtGui, qmouse_qws.h)
+QT_CLASS_LIB(QMouseDriverFactory, QtGui, qmousedriverfactory_qws.h)
+QT_CLASS_LIB(QWSMouseHandlerFactoryInterface, QtGui, qmousedriverplugin_qws.h)
+QT_CLASS_LIB(QMouseDriverPlugin, QtGui, qmousedriverplugin_qws.h)
+QT_CLASS_LIB(QWSLinuxInputMouseHandler, QtGui, qmouselinuxinput_qws.h)
+QT_CLASS_LIB(QWSLinuxTPMouseHandler, QtGui, qmouselinuxtp_qws.h)
+QT_CLASS_LIB(QWSPcMouseHandler, QtGui, qmousepc_qws.h)
+QT_CLASS_LIB(QQnxMouseHandler, QtGui, qmouseqnx_qws.h)
+QT_CLASS_LIB(QWSTslibMouseHandler, QtGui, qmousetslib_qws.h)
+QT_CLASS_LIB(QVFbMouseHandler, QtGui, qmousevfb_qws.h)
+QT_CLASS_LIB(QScreenCursor, QtGui, qscreen_qws.h)
+QT_CLASS_LIB(QPoolEntry, QtGui, qscreen_qws.h)
+QT_CLASS_LIB(QScreen, QtGui, qscreen_qws.h)
+QT_CLASS_LIB(QScreenDriverFactory, QtGui, qscreendriverfactory_qws.h)
+QT_CLASS_LIB(QScreenDriverFactoryInterface, QtGui, qscreendriverplugin_qws.h)
+QT_CLASS_LIB(QScreenDriverPlugin, QtGui, qscreendriverplugin_qws.h)
+QT_CLASS_LIB(QLinuxFb_Shared, QtGui, qscreenlinuxfb_qws.h)
+QT_CLASS_LIB(QLinuxFbScreen, QtGui, qscreenlinuxfb_qws.h)
+QT_CLASS_LIB(QProxyScreenCursor, QtGui, qscreenproxy_qws.h)
+QT_CLASS_LIB(QProxyScreen, QtGui, qscreenproxy_qws.h)
+QT_CLASS_LIB(QQnxScreen, QtGui, qscreenqnx_qws.h)
+QT_CLASS_LIB(QTransformedScreen, QtGui, qscreentransformed_qws.h)
+QT_CLASS_LIB(QVFbScreen, QtGui, qscreenvfb_qws.h)
+QT_CLASS_LIB(QWSSoundServer, QtGui, qsoundqss_qws.h)
+QT_CLASS_LIB(QWSSoundClient, QtGui, qsoundqss_qws.h)
+QT_CLASS_LIB(QWSSoundServerSocket, QtGui, qsoundqss_qws.h)
+QT_CLASS_LIB(QTransportAuth, QtGui, qtransportauth_qws.h)
+QT_CLASS_LIB(QAuthDevice, QtGui, qtransportauth_qws.h)
+QT_CLASS_LIB(QVFbHeader, QtGui, qvfbhdr.h)
+QT_CLASS_LIB(QVFbKeyData, QtGui, qvfbhdr.h)
+QT_CLASS_LIB(QWSInternalWindowInfo, QtGui, qwindowsystem_qws.h)
+QT_CLASS_LIB(QWSScreenSaver, QtGui, qwindowsystem_qws.h)
+QT_CLASS_LIB(QWSWindow, QtGui, qwindowsystem_qws.h)
+QT_CLASS_LIB(QWSSoundServer, QtGui, qwindowsystem_qws.h)
+QT_CLASS_LIB(QWSServer, QtGui, qwindowsystem_qws.h)
+QT_CLASS_LIB(QWSInputMethod, QtGui, qwindowsystem_qws.h)
+QT_CLASS_LIB(QWSCursorMap, QtGui, qwindowsystem_qws.h)
+QT_CLASS_LIB(QWSClient, QtGui, qwindowsystem_qws.h)
+QT_CLASS_LIB(QWSCursor, QtGui, qwscursor_qws.h)
+QT_CLASS_LIB(QWSWindowInfo, QtGui, qwsdisplay_qws.h)
+QT_CLASS_LIB(QWSDisplay, QtGui, qwsdisplay_qws.h)
+QT_CLASS_LIB(QWSEmbedWidget, QtGui, qwsembedwidget.h)
+QT_CLASS_LIB(QWSEvent, QtGui, qwsevent_qws.h)
+QT_CLASS_LIB(QWSManager, QtGui, qwsmanager_qws.h)
+QT_CLASS_LIB(QWSPropertyManager, QtGui, qwsproperty_qws.h)
+QT_CLASS_LIB(QWSProtocolItem, QtGui, qwsprotocolitem_qws.h)
+QT_CLASS_LIB(QWSSocket, QtGui, qwssocket_qws.h)
+QT_CLASS_LIB(QWSServerSocket, QtGui, qwssocket_qws.h)
+QT_CLASS_LIB(QBitmap, QtGui, qbitmap.h)
+QT_CLASS_LIB(QIcon, QtGui, qicon.h)
+QT_CLASS_LIB(QIconSet, QtGui, qicon.h)
+QT_CLASS_LIB(QIconEngine, QtGui, qiconengine.h)
+QT_CLASS_LIB(QIconEngineV2, QtGui, qiconengine.h)
+QT_CLASS_LIB(QIconEngineFactoryInterface, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QIconEnginePlugin, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QIconEngineFactoryInterfaceV2, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QIconEnginePluginV2, QtGui, qiconengineplugin.h)
+QT_CLASS_LIB(QImageTextKeyLang, QtGui, qimage.h)
+QT_CLASS_LIB(QImage, QtGui, qimage.h)
+QT_CLASS_LIB(QImageIOHandler, QtGui, qimageiohandler.h)
+QT_CLASS_LIB(QImageIOHandlerFactoryInterface, QtGui, qimageiohandler.h)
+QT_CLASS_LIB(QImageIOPlugin, QtGui, qimageiohandler.h)
+QT_CLASS_LIB(QImageReader, QtGui, qimagereader.h)
+QT_CLASS_LIB(QImageWriter, QtGui, qimagewriter.h)
+QT_CLASS_LIB(QMovie, QtGui, qmovie.h)
+QT_CLASS_LIB(QPicture, QtGui, qpicture.h)
+QT_CLASS_LIB(QPictureIO, QtGui, qpicture.h)
+QT_CLASS_LIB(QPictureFormatInterface, QtGui, qpictureformatplugin.h)
+QT_CLASS_LIB(QPictureFormatPlugin, QtGui, qpictureformatplugin.h)
+QT_CLASS_LIB(QPixmap, QtGui, qpixmap.h)
+QT_CLASS_LIB(QPixmapCache, QtGui, qpixmapcache.h)
+QT_CLASS_LIB(QAbstractPageSetupDialog, QtGui, qabstractpagesetupdialog.h)
+QT_CLASS_LIB(QAbstractPrintDialog, QtGui, qabstractprintdialog.h)
+QT_CLASS_LIB(QColorDialog, QtGui, qcolordialog.h)
+QT_CLASS_LIB(QDialog, QtGui, qdialog.h)
+QT_CLASS_LIB(QErrorMessage, QtGui, qerrormessage.h)
+QT_CLASS_LIB(QFileDialog, QtGui, qfiledialog.h)
+QT_CLASS_LIB(QFileSystemModel, QtGui, qfilesystemmodel.h)
+QT_CLASS_LIB(QFontDialog, QtGui, qfontdialog.h)
+QT_CLASS_LIB(QInputDialog, QtGui, qinputdialog.h)
+QT_CLASS_LIB(QMessageBox, QtGui, qmessagebox.h)
+QT_CLASS_LIB(QPageSetupDialog, QtGui, qpagesetupdialog.h)
+QT_CLASS_LIB(QUnixPrintWidget, QtGui, qprintdialog.h)
+QT_CLASS_LIB(QPrintDialog, QtGui, qprintdialog.h)
+QT_CLASS_LIB(QPrintPreviewDialog, QtGui, qprintpreviewdialog.h)
+QT_CLASS_LIB(QProgressDialog, QtGui, qprogressdialog.h)
+QT_CLASS_LIB(QWizard, QtGui, qwizard.h)
+QT_CLASS_LIB(QWizardPage, QtGui, qwizard.h)
+QT_CLASS_LIB(QAbstractItemDelegate, QtGui, qabstractitemdelegate.h)
+QT_CLASS_LIB(QAbstractItemView, QtGui, qabstractitemview.h)
+QT_CLASS_LIB(QAbstractProxyModel, QtGui, qabstractproxymodel.h)
+QT_CLASS_LIB(QColumnView, QtGui, qcolumnview.h)
+QT_CLASS_LIB(QDataWidgetMapper, QtGui, qdatawidgetmapper.h)
+QT_CLASS_LIB(QDirModel, QtGui, qdirmodel.h)
+QT_CLASS_LIB(QFileIconProvider, QtGui, qfileiconprovider.h)
+QT_CLASS_LIB(QHeaderView, QtGui, qheaderview.h)
+QT_CLASS_LIB(QItemDelegate, QtGui, qitemdelegate.h)
+QT_CLASS_LIB(QItemEditorCreatorBase, QtGui, qitemeditorfactory.h)
+QT_CLASS_LIB(QItemEditorCreator, QtGui, qitemeditorfactory.h)
+QT_CLASS_LIB(QStandardItemEditorCreator, QtGui, qitemeditorfactory.h)
+QT_CLASS_LIB(QItemEditorFactory, QtGui, qitemeditorfactory.h)
+QT_CLASS_LIB(QItemSelectionRange, QtGui, qitemselectionmodel.h)
+QT_CLASS_LIB(QItemSelectionModel, QtGui, qitemselectionmodel.h)
+QT_CLASS_LIB(QItemSelection, QtGui, qitemselectionmodel.h)
+QT_CLASS_LIB(QListView, QtGui, qlistview.h)
+QT_CLASS_LIB(QListWidgetItem, QtGui, qlistwidget.h)
+QT_CLASS_LIB(QListWidget, QtGui, qlistwidget.h)
+QT_CLASS_LIB(QProxyModel, QtGui, qproxymodel.h)
+QT_CLASS_LIB(QSortFilterProxyModel, QtGui, qsortfilterproxymodel.h)
+QT_CLASS_LIB(QStandardItem, QtGui, qstandarditemmodel.h)
+QT_CLASS_LIB(QStandardItemModel, QtGui, qstandarditemmodel.h)
+QT_CLASS_LIB(QStringListModel, QtGui, qstringlistmodel.h)
+QT_CLASS_LIB(QStyledItemDelegate, QtGui, qstyleditemdelegate.h)
+QT_CLASS_LIB(QTableView, QtGui, qtableview.h)
+QT_CLASS_LIB(QTableWidgetSelectionRange, QtGui, qtablewidget.h)
+QT_CLASS_LIB(QTableWidgetItem, QtGui, qtablewidget.h)
+QT_CLASS_LIB(QTableWidget, QtGui, qtablewidget.h)
+QT_CLASS_LIB(QTreeView, QtGui, qtreeview.h)
+QT_CLASS_LIB(QTreeWidgetItem, QtGui, qtreewidget.h)
+QT_CLASS_LIB(QTreeWidget, QtGui, qtreewidget.h)
+QT_CLASS_LIB(QTreeWidgetItemIterator, QtGui, qtreewidgetitemiterator.h)
+QT_CLASS_LIB(QAccessible, QtGui, qaccessible.h)
+QT_CLASS_LIB(QAccessibleInterface, QtGui, qaccessible.h)
+QT_CLASS_LIB(QAccessibleInterfaceEx, QtGui, qaccessible.h)
+QT_CLASS_LIB(QAccessibleEvent, QtGui, qaccessible.h)
+QT_CLASS_LIB(QAccessible2Interface, QtGui, qaccessible2.h)
+QT_CLASS_LIB(QAccessibleTextInterface, QtGui, qaccessible2.h)
+QT_CLASS_LIB(QAccessibleEditableTextInterface, QtGui, qaccessible2.h)
+QT_CLASS_LIB(QAccessibleSimpleEditableTextInterface, QtGui, qaccessible2.h)
+QT_CLASS_LIB(QAccessibleValueInterface, QtGui, qaccessible2.h)
+QT_CLASS_LIB(QAccessibleTableInterface, QtGui, qaccessible2.h)
+QT_CLASS_LIB(QAccessibleActionInterface, QtGui, qaccessible2.h)
+QT_CLASS_LIB(QAccessibleImageInterface, QtGui, qaccessible2.h)
+QT_CLASS_LIB(QAccessibleBridge, QtGui, qaccessiblebridge.h)
+QT_CLASS_LIB(QAccessibleBridgeFactoryInterface, QtGui, qaccessiblebridge.h)
+QT_CLASS_LIB(QAccessibleBridgePlugin, QtGui, qaccessiblebridge.h)
+QT_CLASS_LIB(QAccessibleObject, QtGui, qaccessibleobject.h)
+QT_CLASS_LIB(QAccessibleObjectEx, QtGui, qaccessibleobject.h)
+QT_CLASS_LIB(QAccessibleApplication, QtGui, qaccessibleobject.h)
+QT_CLASS_LIB(QAccessibleFactoryInterface, QtGui, qaccessibleplugin.h)
+QT_CLASS_LIB(QAccessiblePlugin, QtGui, qaccessibleplugin.h)
+QT_CLASS_LIB(QAccessibleWidget, QtGui, qaccessiblewidget.h)
+QT_CLASS_LIB(QAccessibleWidgetEx, QtGui, qaccessiblewidget.h)
 QT_CLASS_LIB(QCompleter, QtGui, qcompleter.h)
 QT_CLASS_LIB(QDesktopServices, QtGui, qdesktopservices.h)
 QT_CLASS_LIB(QSystemTrayIcon, QtGui, qsystemtrayicon.h)
@@ -1087,6 +1087,12 @@ QT_CLASS_LIB(QExtensionFactory, QtDesign
 QT_CLASS_LIB(QAbstractExtensionFactory, QtDesigner, extension.h)
 QT_CLASS_LIB(QAbstractExtensionManager, QtDesigner, extension.h)
 QT_CLASS_LIB(QExtensionManager, QtDesigner, qextensionmanager.h)
+QT_CLASS_LIB(QAbstractFormBuilder, QtDesigner, abstractformbuilder.h)
+QT_CLASS_LIB(QDesignerContainerExtension, QtDesigner, container.h)
+QT_CLASS_LIB(QDesignerCustomWidgetInterface, QtDesigner, customwidget.h)
+QT_CLASS_LIB(QDesignerCustomWidgetCollectionInterface, QtDesigner, customwidget.h)
+QT_CLASS_LIB(QFormBuilder, QtDesigner, formbuilder.h)
+QT_CLASS_LIB(QDesignerExportWidget, QtDesigner, qdesignerexportwidget.h)
 QT_CLASS_LIB(QDesignerActionEditorInterface, QtDesigner, abstractactioneditor.h)
 QT_CLASS_LIB(QDesignerBrushManagerInterface, QtDesigner, abstractbrushmanager.h)
 QT_CLASS_LIB(QDesignerDnDItemInterface, QtDesigner, abstractdnditem.h)
@@ -1115,16 +1121,12 @@ QT_CLASS_LIB(QDesignerLayoutDecorationEx
 QT_CLASS_LIB(QDesignerMemberSheetExtension, QtDesigner, membersheet.h)
 QT_CLASS_LIB(QDesignerPropertySheetExtension, QtDesigner, propertysheet.h)
 QT_CLASS_LIB(QDesignerTaskMenuExtension, QtDesigner, taskmenu.h)
-QT_CLASS_LIB(QAbstractFormBuilder, QtDesigner, abstractformbuilder.h)
-QT_CLASS_LIB(QDesignerContainerExtension, QtDesigner, container.h)
-QT_CLASS_LIB(QDesignerCustomWidgetInterface, QtDesigner, customwidget.h)
-QT_CLASS_LIB(QDesignerCustomWidgetCollectionInterface, QtDesigner, customwidget.h)
-QT_CLASS_LIB(QFormBuilder, QtDesigner, formbuilder.h)
-QT_CLASS_LIB(QDesignerExportWidget, QtDesigner, qdesignerexportwidget.h)
 QT_CLASS_LIB(Phonon::AbstractAudioOutput, phonon, abstractaudiooutput.h)
 QT_CLASS_LIB(Phonon::AbstractMediaStream, phonon, abstractmediastream.h)
 QT_CLASS_LIB(Phonon::AbstractVideoOutput, phonon, abstractvideooutput.h)
 QT_CLASS_LIB(Phonon::AddonInterface, phonon, addoninterface.h)
+QT_CLASS_LIB(Phonon::AudioDataOutput, phonon, audiodataoutput.h)
+QT_CLASS_LIB(Phonon::AudioDataOutputInterface, phonon, audiodataoutputinterface.h)
 QT_CLASS_LIB(Phonon::AudioOutput, phonon, audiooutput.h)
 QT_CLASS_LIB(Phonon::AudioOutputInterface40, phonon, audiooutputinterface.h)
 QT_CLASS_LIB(Phonon::AudioOutputInterface42, phonon, audiooutputinterface.h)
@@ -1136,6 +1138,7 @@ QT_CLASS_LIB(Phonon::Effect, phonon, eff
 QT_CLASS_LIB(Phonon::EffectInterface, phonon, effectinterface.h)
 QT_CLASS_LIB(Phonon::EffectParameter, phonon, effectparameter.h)
 QT_CLASS_LIB(Phonon::EffectWidget, phonon, effectwidget.h)
+QT_CLASS_LIB(Phonon::GlobalConfig, phonon, globalconfig.h)
 QT_CLASS_LIB(Phonon::MediaController, phonon, mediacontroller.h)
 QT_CLASS_LIB(Phonon::MediaNode, phonon, medianode.h)
 QT_CLASS_LIB(Phonon::MediaObject, phonon, mediaobject.h)
@@ -1158,11 +1161,15 @@ QT_CLASS_LIB(Phonon::SubtitleDescription
 QT_CLASS_LIB(Phonon::Path, phonon, path.h)
 QT_CLASS_LIB(Phonon::Global, phonon, phononnamespace.h)
 QT_CLASS_LIB(Phonon::PlatformPlugin, phonon, platformplugin.h)
+QT_CLASS_LIB(Phonon::PulseSupport, phonon, pulsesupport.h)
 QT_CLASS_LIB(Phonon::SeekSlider, phonon, seekslider.h)
 QT_CLASS_LIB(Phonon::StreamInterface, phonon, streaminterface.h)
 QT_CLASS_LIB(Phonon::VideoPlayer, phonon, videoplayer.h)
 QT_CLASS_LIB(Phonon::VideoWidget, phonon, videowidget.h)
 QT_CLASS_LIB(Phonon::VideoWidgetInterface, phonon, videowidgetinterface.h)
+QT_CLASS_LIB(Phonon::VideoWidgetInterface44, phonon, videowidgetinterface.h)
+QT_CLASS_LIB(Phonon::VideoWidgetInterfaceLatest, phonon, videowidgetinterface.h)
+QT_CLASS_LIB(Phonon::VideoWidgetInterfaceLatest, phonon, videowidgetinterface.h)
 QT_CLASS_LIB(Phonon::VolumeFaderEffect, phonon, volumefadereffect.h)
 QT_CLASS_LIB(Phonon::VolumeFaderInterface, phonon, volumefaderinterface.h)
 QT_CLASS_LIB(Phonon::VolumeSlider, phonon, volumeslider.h)
@@ -1170,6 +1177,17 @@ QT_CLASS_LIB(QGraphicsSvgItem, QtSvg, qg
 QT_CLASS_LIB(QSvgGenerator, QtSvg, qsvggenerator.h)
 QT_CLASS_LIB(QSvgRenderer, QtSvg, qsvgrenderer.h)
 QT_CLASS_LIB(QSvgWidget, QtSvg, qsvgwidget.h)
+QT_CLASS_LIB(Q3MultiLineEdit, Qt3Support, q3multilineedit.h)
+QT_CLASS_LIB(Q3SimpleRichText, Qt3Support, q3simplerichtext.h)
+QT_CLASS_LIB(Q3StyleSheetItem, Qt3Support, q3stylesheet.h)
+QT_CLASS_LIB(Q3StyleSheet, Qt3Support, q3stylesheet.h)
+QT_CLASS_LIB(Q3SyntaxHighlighter, Qt3Support, q3syntaxhighlighter.h)
+QT_CLASS_LIB(Q3TextBrowser, Qt3Support, q3textbrowser.h)
+QT_CLASS_LIB(Q3TextEditOptimPrivate, Qt3Support, q3textedit.h)
+QT_CLASS_LIB(Q3TextEdit, Qt3Support, q3textedit.h)
+QT_CLASS_LIB(Q3TextStream, Qt3Support, q3textstream.h)
+QT_CLASS_LIB(Q3TSFUNC, Qt3Support, q3textstream.h)
+QT_CLASS_LIB(Q3TextView, Qt3Support, q3textview.h)
 QT_CLASS_LIB(Q3Action, Qt3Support, q3action.h)
 QT_CLASS_LIB(Q3ActionGroup, Qt3Support, q3action.h)
 QT_CLASS_LIB(Q3Button, Qt3Support, q3button.h)
@@ -1202,18 +1220,10 @@ QT_CLASS_LIB(Q3VBox, Qt3Support, q3vbox.
 QT_CLASS_LIB(Q3VGroupBox, Qt3Support, q3vgroupbox.h)
 QT_CLASS_LIB(Q3WhatsThis, Qt3Support, q3whatsthis.h)
 QT_CLASS_LIB(Q3WidgetStack, Qt3Support, q3widgetstack.h)
-QT_CLASS_LIB(Q3DataBrowser, Qt3Support, q3databrowser.h)
-QT_CLASS_LIB(Q3DataTable, Qt3Support, q3datatable.h)
-QT_CLASS_LIB(Q3DataView, Qt3Support, q3dataview.h)
-QT_CLASS_LIB(Q3EditorFactory, Qt3Support, q3editorfactory.h)
-QT_CLASS_LIB(Q3SqlCursor, Qt3Support, q3sqlcursor.h)
-QT_CLASS_LIB(Q3SqlEditorFactory, Qt3Support, q3sqleditorfactory.h)
-QT_CLASS_LIB(Q3SqlFieldInfo, Qt3Support, q3sqlfieldinfo.h)
-QT_CLASS_LIB(Q3SqlForm, Qt3Support, q3sqlform.h)
-QT_CLASS_LIB(Q3SqlPropertyMap, Qt3Support, q3sqlpropertymap.h)
-QT_CLASS_LIB(Q3SqlFieldInfoList, Qt3Support, q3sqlrecordinfo.h)
-QT_CLASS_LIB(Q3SqlRecordInfo, Qt3Support, q3sqlrecordinfo.h)
-QT_CLASS_LIB(Q3SqlSelectCursor, Qt3Support, q3sqlselectcursor.h)
+QT_CLASS_LIB(Q3PaintDeviceMetrics, Qt3Support, q3paintdevicemetrics.h)
+QT_CLASS_LIB(Q3Painter, Qt3Support, q3painter.h)
+QT_CLASS_LIB(Q3Picture, Qt3Support, q3picture.h)
+QT_CLASS_LIB(Q3PointArray, Qt3Support, q3pointarray.h)
 QT_CLASS_LIB(Q3Dns, Qt3Support, q3dns.h)
 QT_CLASS_LIB(Q3DnsSocket, Qt3Support, q3dns.h)
 QT_CLASS_LIB(Q3Ftp, Qt3Support, q3ftp.h)
@@ -1232,38 +1242,32 @@ QT_CLASS_LIB(Q3Socket, Qt3Support, q3soc
 QT_CLASS_LIB(Q3SocketDevice, Qt3Support, q3socketdevice.h)
 QT_CLASS_LIB(Q3Url, Qt3Support, q3url.h)
 QT_CLASS_LIB(Q3UrlOperator, Qt3Support, q3urloperator.h)
-QT_CLASS_LIB(Q3MultiLineEdit, Qt3Support, q3multilineedit.h)
-QT_CLASS_LIB(Q3SimpleRichText, Qt3Support, q3simplerichtext.h)
-QT_CLASS_LIB(Q3StyleSheetItem, Qt3Support, q3stylesheet.h)
-QT_CLASS_LIB(Q3StyleSheet, Qt3Support, q3stylesheet.h)
-QT_CLASS_LIB(Q3SyntaxHighlighter, Qt3Support, q3syntaxhighlighter.h)
-QT_CLASS_LIB(Q3TextBrowser, Qt3Support, q3textbrowser.h)
-QT_CLASS_LIB(Q3TextEditOptimPrivate, Qt3Support, q3textedit.h)
-QT_CLASS_LIB(Q3TextEdit, Qt3Support, q3textedit.h)
-QT_CLASS_LIB(Q3TextStream, Qt3Support, q3textstream.h)
-QT_CLASS_LIB(Q3TSFUNC, Qt3Support, q3textstream.h)
-QT_CLASS_LIB(Q3TextView, Qt3Support, q3textview.h)
-QT_CLASS_LIB(Q3FileIconProvider, Qt3Support, q3filedialog.h)
-QT_CLASS_LIB(Q3FilePreview, Qt3Support, q3filedialog.h)
-QT_CLASS_LIB(Q3FileDialog, Qt3Support, q3filedialog.h)
-QT_CLASS_LIB(Q3ProgressDialog, Qt3Support, q3progressdialog.h)
-QT_CLASS_LIB(Q3TabDialog, Qt3Support, q3tabdialog.h)
-QT_CLASS_LIB(Q3Wizard, Qt3Support, q3wizard.h)
-QT_CLASS_LIB(Q3Accel, Qt3Support, q3accel.h)
-QT_CLASS_LIB(Q3BoxLayout, Qt3Support, q3boxlayout.h)
-QT_CLASS_LIB(Q3HBoxLayout, Qt3Support, q3boxlayout.h)
-QT_CLASS_LIB(Q3VBoxLayout, Qt3Support, q3boxlayout.h)
-QT_CLASS_LIB(Q3DragObject, Qt3Support, q3dragobject.h)
-QT_CLASS_LIB(Q3StoredDrag, Qt3Support, q3dragobject.h)
-QT_CLASS_LIB(Q3TextDrag, Qt3Support, q3dragobject.h)
-QT_CLASS_LIB(Q3ImageDrag, Qt3Support, q3dragobject.h)
-QT_CLASS_LIB(Q3UriDrag, Qt3Support, q3dragobject.h)
-QT_CLASS_LIB(Q3ColorDrag, Qt3Support, q3dragobject.h)
-QT_CLASS_LIB(Q3DropSite, Qt3Support, q3dropsite.h)
-QT_CLASS_LIB(Q3GridLayout, Qt3Support, q3gridlayout.h)
-QT_CLASS_LIB(Q3MimeSourceFactory, Qt3Support, q3mimefactory.h)
-QT_CLASS_LIB(Q3PolygonScanner, Qt3Support, q3polygonscanner.h)
-QT_CLASS_LIB(Q3Process, Qt3Support, q3process.h)
+QT_CLASS_LIB(Q3DataBrowser, Qt3Support, q3databrowser.h)
+QT_CLASS_LIB(Q3DataTable, Qt3Support, q3datatable.h)
+QT_CLASS_LIB(Q3DataView, Qt3Support, q3dataview.h)
+QT_CLASS_LIB(Q3EditorFactory, Qt3Support, q3editorfactory.h)
+QT_CLASS_LIB(Q3SqlCursor, Qt3Support, q3sqlcursor.h)
+QT_CLASS_LIB(Q3SqlEditorFactory, Qt3Support, q3sqleditorfactory.h)
+QT_CLASS_LIB(Q3SqlFieldInfo, Qt3Support, q3sqlfieldinfo.h)
+QT_CLASS_LIB(Q3SqlForm, Qt3Support, q3sqlform.h)
+QT_CLASS_LIB(Q3SqlPropertyMap, Qt3Support, q3sqlpropertymap.h)
+QT_CLASS_LIB(Q3SqlFieldInfoList, Qt3Support, q3sqlrecordinfo.h)
+QT_CLASS_LIB(Q3SqlRecordInfo, Qt3Support, q3sqlrecordinfo.h)
+QT_CLASS_LIB(Q3SqlSelectCursor, Qt3Support, q3sqlselectcursor.h)
+QT_CLASS_LIB(Q3CanvasItemList, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasItem, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3Canvas, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasView, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasPixmap, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasPixmapArray, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasSprite, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasPolygonalItem, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasRectangle, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasPolygon, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasSpline, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasLine, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasEllipse, Qt3Support, q3canvas.h)
+QT_CLASS_LIB(Q3CanvasText, Qt3Support, q3canvas.h)
 QT_CLASS_LIB(Q3AsciiCache, Qt3Support, q3asciicache.h)
 QT_CLASS_LIB(Q3AsciiCacheIterator, Qt3Support, q3asciicache.h)
 QT_CLASS_LIB(Q3AsciiDict, Qt3Support, q3asciidict.h)
@@ -1321,6 +1325,27 @@ QT_CLASS_LIB(Q3ValueListConstIterator, Q
 QT_CLASS_LIB(Q3ValueList, Qt3Support, q3valuelist.h)
 QT_CLASS_LIB(Q3ValueStack, Qt3Support, q3valuestack.h)
 QT_CLASS_LIB(Q3ValueVector, Qt3Support, q3valuevector.h)
+QT_CLASS_LIB(Q3FileIconProvider, Qt3Support, q3filedialog.h)
+QT_CLASS_LIB(Q3FilePreview, Qt3Support, q3filedialog.h)
+QT_CLASS_LIB(Q3FileDialog, Qt3Support, q3filedialog.h)
+QT_CLASS_LIB(Q3ProgressDialog, Qt3Support, q3progressdialog.h)
+QT_CLASS_LIB(Q3TabDialog, Qt3Support, q3tabdialog.h)
+QT_CLASS_LIB(Q3Wizard, Qt3Support, q3wizard.h)
+QT_CLASS_LIB(Q3Accel, Qt3Support, q3accel.h)
+QT_CLASS_LIB(Q3BoxLayout, Qt3Support, q3boxlayout.h)
+QT_CLASS_LIB(Q3HBoxLayout, Qt3Support, q3boxlayout.h)
+QT_CLASS_LIB(Q3VBoxLayout, Qt3Support, q3boxlayout.h)
+QT_CLASS_LIB(Q3DragObject, Qt3Support, q3dragobject.h)
+QT_CLASS_LIB(Q3StoredDrag, Qt3Support, q3dragobject.h)
+QT_CLASS_LIB(Q3TextDrag, Qt3Support, q3dragobject.h)
+QT_CLASS_LIB(Q3ImageDrag, Qt3Support, q3dragobject.h)
+QT_CLASS_LIB(Q3UriDrag, Qt3Support, q3dragobject.h)
+QT_CLASS_LIB(Q3ColorDrag, Qt3Support, q3dragobject.h)
+QT_CLASS_LIB(Q3DropSite, Qt3Support, q3dropsite.h)
+QT_CLASS_LIB(Q3GridLayout, Qt3Support, q3gridlayout.h)
+QT_CLASS_LIB(Q3MimeSourceFactory, Qt3Support, q3mimefactory.h)
+QT_CLASS_LIB(Q3PolygonScanner, Qt3Support, q3polygonscanner.h)
+QT_CLASS_LIB(Q3Process, Qt3Support, q3process.h)
 QT_CLASS_LIB(Q3IconDragItem, Qt3Support, q3iconview.h)
 QT_CLASS_LIB(Q3IconDrag, Qt3Support, q3iconview.h)
 QT_CLASS_LIB(Q3IconViewItem, Qt3Support, q3iconview.h)
@@ -1338,21 +1363,3 @@ QT_CLASS_LIB(Q3TableItem, Qt3Support, q3
 QT_CLASS_LIB(Q3ComboTableItem, Qt3Support, q3table.h)
 QT_CLASS_LIB(Q3CheckTableItem, Qt3Support, q3table.h)
 QT_CLASS_LIB(Q3Table, Qt3Support, q3table.h)
-QT_CLASS_LIB(Q3PaintDeviceMetrics, Qt3Support, q3paintdevicemetrics.h)
-QT_CLASS_LIB(Q3Painter, Qt3Support, q3painter.h)
-QT_CLASS_LIB(Q3Picture, Qt3Support, q3picture.h)
-QT_CLASS_LIB(Q3PointArray, Qt3Support, q3pointarray.h)
-QT_CLASS_LIB(Q3CanvasItemList, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasItem, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3Canvas, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasView, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasPixmap, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasPixmapArray, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasSprite, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasPolygonalItem, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasRectangle, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasPolygon, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasSpline, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasLine, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasEllipse, Qt3Support, q3canvas.h)
-QT_CLASS_LIB(Q3CanvasText, Qt3Support, q3canvas.h)