Merge remote-tracking branch 'origin/5.4' into 5.5
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 08:48:51 +0000 (09:48 +0100)
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Tue, 17 Mar 2015 08:48:51 +0000 (09:48 +0100)
commit64b75cc1d7ab1c3a557c809e15154d5d3a03d1ad
treefc77380849c882da0dbc3c96f4fbbf92b0c21d33
parentd109e6dd5d6a18e715b979f3d3ef845946b1b787
parentd4208cc5a1c6d6bf114653b39b8880fe4c00c1f3
Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Id24f14bef17b86e7027e055473f0357854780979
src/gsttools/qgstreameraudioinputselector.cpp
src/multimediawidgets/qpaintervideosurface.cpp
src/plugins/alsa/qalsaaudiodeviceinfo.cpp
src/plugins/android/src/mediaplayer/qandroidmediaplayercontrol.cpp