diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-05-05 11:48:21 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-05-05 11:48:21 +0200 |
| commit | 9d2943bce8a3706a05bea57ff8ce6586b52eb8b0 (patch) | |
| tree | 933bb2a4996afd9c7bdfb824af03b9bce16843eb /src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.cpp | |
| parent | fe13f5bb05ef278eb5109a9518118dda7ddb0b9d (diff) | |
| parent | cc0569a038f6116df559508518b6dacb15be8520 (diff) | |
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
Diffstat (limited to 'src/plugins/qnx/camera/bbcameraaudioencodersettingscontrol.cpp')
0 files changed, 0 insertions, 0 deletions