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
2015-05-05 11:48:21 +02:00
parent fe13f5bb05 cc0569a038
commit 9d2943bce8
11 changed files with 191 additions and 65 deletions
--- a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h
+++ b/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.h
@@ -69,6 +69,7 @@ private:

    QString m_activeInput;
    bool m_dirty;
+    QString m_defaultDevice;
    QStringList m_devices;
    QMap<QString, QString> m_deviceDescriptions;
 };