Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	src/gsttools/qgstreamervideoinputdevicecontrol.cpp
	src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
	src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp

Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de

diff --cc config.tests/wmp/main.cpp
Simple merge

diff --cc examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
Simple merge

diff --cc examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
Simple merge

diff --cc examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml
Simple merge

diff --cc src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp
Simple merge

diff --cc src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.h
Simple merge

diff --cc src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp
Simple merge

diff --cc src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.cpp
Simple merge

diff --cc src/plugins/android/src/mediaplayer/qandroidmetadatareadercontrol.h
Simple merge

diff --cc src/plugins/android/src/wrappers/jni/androidmediametadataretriever.cpp
Simple merge

diff --cc src/plugins/android/src/wrappers/jni/androidmediametadataretriever.h
Simple merge

diff --cc src/plugins/avfoundation/mediaplayer/avfmediaplayersession.h
Simple merge

diff --cc src/plugins/gstreamer/camerabin/camerabin.pro
Simple merge

diff --cc src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
Simple merge

diff --cc src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
Simple merge

diff --cc src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.h
Simple merge

diff --cc src/plugins/opensles/qopenslesaudiooutput.cpp
Simple merge

diff --cc src/plugins/opensles/qopenslesaudiooutput.h
Simple merge

diff --cc src/plugins/plugins.pro
index 0020203,6a23fd2..f03a138
--- 1/src/plugins/plugins.pro
--- 2/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@@ -40,11 -36,16 +40,13 @@@ unix:!mac:!android 
          SUBDIRS += audiocapture
      }
  
 -    config_pulseaudio {
 -        SUBDIRS += pulseaudio
 -    } else:config_alsa {
 -        SUBDIRS += alsa
 -    }
 +    config_pulseaudio: SUBDIRS += pulseaudio
 +    config_alsa: SUBDIRS += alsa
  
      # v4l is turned off because it is not supported in Qt 5
-     # !maemo*:SUBDIRS += v4l
+     # config_linux_v4l {
+     #     !maemo*:SUBDIRS += v4l
+     # }
  }
  
  mac:!simulator {

diff --cc src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
Simple merge

diff --cc src/plugins/wmf/player/mfplayersession.cpp
Simple merge

diff --cc src/qtmultimediaquicktools/qsgvideonode_rgb.cpp
Simple merge