Merge branch '1.0'

Conflicts:
	config.tests/tunerlib_s60/main.cpp
	configure.bat
	doc/src/examples/sfw-notes.qdoc
	doc/src/snippets/multimedia-snippets/player.cpp
	examples/audiodevices/main.cpp
	examples/audiorecorder/audiorecorder.cpp
	examples/player/player.cpp
	examples/servicenotesmanager/sfw-notes/main.cpp
	examples/servicenotesmanager/sfw-notes/sfwnotes.h
	examples/videowidget/main.cpp
	features/mobility.prf.template
	plugins/declarative/multimedia/multimedia.cpp
	plugins/declarative/multimedia/multimedia.pro
	plugins/declarative/multimedia/qdeclarativeaudio.cpp
	plugins/declarative/multimedia/qdeclarativeaudio_p.h
	plugins/declarative/multimedia/qdeclarativemediabase.cpp
	plugins/declarative/multimedia/qdeclarativemediabase_p.h
	plugins/declarative/multimedia/qdeclarativevideo.cpp
	plugins/declarative/multimedia/qdeclarativevideo_p.h
	plugins/declarative/multimedia/qmetadatacontrolmetaobject.cpp
	plugins/declarative/multimedia/qmetadatacontrolmetaobject_p.h
	plugins/multimedia/audiocapture/audioencodercontrol.cpp
	plugins/multimedia/directshow/directshow.pro
	plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp
	plugins/multimedia/directshow/player/directshowmetadatacontrol.h
	plugins/multimedia/gstreamer/gstreamer.pro
	plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp
	plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h
	plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp
	plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h
	plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h
	plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp
	plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
	plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
	plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp
	plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp
	plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
	plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h
	plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
	plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h
	plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
	plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h
	plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
	plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
	plugins/multimedia/m3u/m3u.pro
	plugins/multimedia/qt7/qt7.pro
	plugins/multimedia/qt7/qt7movierenderer.mm
	plugins/multimedia/qt7/qt7playermetadata.h
	plugins/multimedia/qt7/qt7playermetadata.mm
	plugins/multimedia/qt7/qt7videooutput.h
	plugins/multimedia/symbian/audiosource/s60audiocaptureservice.h
	plugins/multimedia/symbian/audiosource/s60audioencodercontrol.h
	plugins/multimedia/symbian/audiosource/s60audioendpointselector.h
	plugins/multimedia/symbian/audiosource/s60audiomediarecordercontrol.h
	plugins/multimedia/symbian/mediaplayer/s60videorenderer.h
	plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h
	plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h
	plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
	plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h
	plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
	plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h
	plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
	plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h
	plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
	plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp
	plugins/multimedia/symbian/mmf/mmf.pro
	plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp
	plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h
	plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp
	plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h
	plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h
	plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h
	plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro
	plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h
	plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h
	plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h~51509540960f75b3081a288526da21cbf198e9b5
	plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp
	plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp
	plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h
	plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp
	plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h
	plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp
	plugins/multimedia/symbian/s60mediaserviceplugin.h
	plugins/multimedia/symbian/s60videooutputcontrol.cpp
	plugins/multimedia/symbian/s60videooutputcontrol.h
	plugins/multimedia/v4l/radio/v4lradiocontrol.cpp
	plugins/multimedia/v4l/radio/v4lradiocontrol.h
	plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp
	plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h
	plugins/multimedia/wmp/qwmpmetadata.cpp
	plugins/multimedia/wmp/qwmpmetadata.h
	plugins/multimedia/wmp/qwmpplayerservice.h
	plugins/sensors/maemo6/maemo6accelerometer.h
	plugins/sensors/maemo6/maemo6compass.h
	plugins/sensors/maemo6/maemo6magnetometer.cpp
	plugins/sensors/maemo6/maemo6rotationsensor.h
	plugins/sensors/maemo6/maemo6sensorbase.h
	plugins/sensors/s60_sensor_api/qs60sensorapicommon.h
	src/contacts/qcontactactiondescriptor.h
	src/contacts/qcontactactionfactory.h
	src/multimedia/audio/qaudioformat.h
	src/multimedia/effects/qsoundeffect.cpp
	src/multimedia/effects/qsoundeffect.h
	src/multimedia/effects/qsoundeffect_pulse_p.cpp
	src/multimedia/effects/qsoundeffect_pulse_p.h
	src/multimedia/effects/qsoundeffect_qsound_p.cpp
	src/multimedia/effects/wavedecoder_p.h
	src/multimedia/multimedia.pro
	src/multimedia/qaudiocapturesource.cpp
	src/multimedia/qaudiocapturesource.h
	src/multimedia/qaudioendpointselector.h
	src/multimedia/qgraphicsvideoitem.cpp
	src/multimedia/qgraphicsvideoitem.h
	src/multimedia/qgraphicsvideoitem_maemo5.cpp
	src/multimedia/qmediaencodersettings.cpp
	src/multimedia/qmediaencodersettings.h
	src/multimedia/qmediaimageviewer.cpp
	src/multimedia/qmediaimageviewerservice.cpp
	src/multimedia/qmediaimageviewerservice_p.h
	src/multimedia/qmediaobject.cpp
	src/multimedia/qmediaobject.h
	src/multimedia/qmediaplayer.cpp
	src/multimedia/qmediaplayer.h
	src/multimedia/qmediaplaylist.h
	src/multimedia/qmediarecorder.cpp
	src/multimedia/qmediarecorder.h
	src/multimedia/qmediaserviceprovider.cpp
	src/multimedia/qmediaserviceprovider.h
	src/multimedia/qmediaserviceproviderplugin.h
	src/multimedia/qmediastreamscontrol.cpp
	src/multimedia/qmediastreamscontrol.h
	src/multimedia/qmetadatareadercontrol.h
	src/multimedia/qmetadatawritercontrol.cpp
	src/multimedia/qmetadatawritercontrol.h
	src/multimedia/qpaintervideosurface.cpp
	src/multimedia/qpaintervideosurface_mac_p.h
	src/multimedia/qpaintervideosurface_p.h
	src/multimedia/qradiotuner.cpp
	src/multimedia/qradiotuner.h
	src/multimedia/qradiotunercontrol.cpp
	src/multimedia/qradiotunercontrol.h
	src/multimedia/qtmedianamespace.h
	src/multimedia/qtmedianamespace.qdoc
	src/multimedia/qvideooutputcontrol.cpp
	src/multimedia/qvideowidget.cpp
	src/multimedia/qvideowidget_p.h
	src/multimedia/video/qabstractvideobuffer.h
	src/multimedia/video/qabstractvideosurface.h
	src/multimedia/video/qimagevideobuffer.cpp
	src/s60installs/s60installs.pro
	src/systeminfo/symbian/chargingstatus_s60.h
	tests/auto/qaudiooutput/wavheader.h
	tests/auto/qcontactactions/sendemailaction/sendemailaction_p.h
	tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp
	tests/auto/qmediaobject/tst_qmediaobject.cpp
	tests/auto/qmediaplayer/tst_qmediaplayer.cpp
	tests/auto/qmediarecorder/tst_qmediarecorder.cpp
	tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
	tests/auto/qradiotuner/tst_qradiotuner.cpp
	tests/auto/qsensor/test_sensor.h
	tests/auto/qvideowidget/tst_qvideowidget.cpp
	tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp
	tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp
	tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa.cpp
	tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_aac.cpp
	tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_amr.cpp
	tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_macros.h
	tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_main.cpp
	tests/auto/symbian/qmediarecorder_xa/tst_qmediarecorder_xa_wav.cpp
	tests/playerex_s60/main.cpp
	tests/playerex_s60/videowidget.cpp

1 files changed, 2 insertions, 0 deletions

diff --git a/plugins/multimedia/gstreamer/qx11videosurface.h b/plugins/multimedia/gstreamer/qx11videosurface.h
index 2f9c132cb5..0baca4bf3b 100644
--- a/plugins/multimedia/gstreamer/qx11videosurface.h
+++ b/plugins/multimedia/gstreamer/qx11videosurface.h
@@ -49,6 +49,8 @@
 
 #ifndef QT_NO_XVIDEO
 
+#ifndef QT_NO_XVIDEO
+
 #include <X11/Xlib.h>
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvlib.h>