Merge remote-tracking branch 'origin/5.4' into 5.5
authorYoann Lopes <yoann.lopes@theqtcompany.com>
Tue, 5 May 2015 09:48:21 +0000 (11:48 +0200)
committerYoann Lopes <yoann.lopes@theqtcompany.com>
Tue, 5 May 2015 09:48:21 +0000 (11:48 +0200)
commit9d2943bce8a3706a05bea57ff8ce6586b52eb8b0
tree933bb2a4996afd9c7bdfb824af03b9bce16843eb
parentfe13f5bb05ef278eb5109a9518118dda7ddb0b9d
parentcc0569a038f6116df559508518b6dacb15be8520
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
.qmake.conf
src/plugins/avfoundation/camera/avfcamerasession.h
src/plugins/avfoundation/camera/avfcamerasession.mm

Change-Id: Ib2e25d907a7069591920d2f69e007f314cc0fd85
src/plugins/android/src/mediacapture/qandroidcapturesession.cpp
src/plugins/android/src/mediacapture/qandroidcapturesession.h
src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h
src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm
src/plugins/avfoundation/camera/avfcamerasession.h
src/plugins/avfoundation/camera/avfcamerasession.mm
src/plugins/avfoundation/camera/avfmediarecordercontrol.h
src/plugins/avfoundation/camera/avfmediarecordercontrol.mm