Merge lp://staging/qtubuntu-camera/staging into lp://staging/qtubuntu-camera
Proposed by
Florian Boucault
| Status: | Merged |
|---|---|
| Approved by: | Florian Boucault |
| Approved revision: | 185 |
| Merged at revision: | 159 |
| Proposed branch: | lp://staging/qtubuntu-camera/staging |
| Merge into: | lp://staging/qtubuntu-camera |
| Diff against target: |
631 lines (+341/-43) 14 files modified
src/aalcameracontrol.cpp (+13/-9) src/aalcamerainfocontrol.cpp (+33/-0) src/aalcamerainfocontrol.h (+32/-0) src/aalcameraservice.cpp (+17/-12) src/aalcameraservice.h (+3/-0) src/aalcameraserviceplugin.cpp (+71/-5) src/aalcameraserviceplugin.h (+5/-1) src/aalvideodeviceselectorcontrol.cpp (+4/-14) src/src.pro (+2/-0) unittests/aalvideodeviceselectorcontrol/aalvideodeviceselectorcontrol.pro (+6/-2) unittests/aalvideodeviceselectorcontrol/tst_aalvideodeviceselectorcontrol.cpp (+5/-0) unittests/stubs/qcamerainfo_stub.cpp (+81/-0) unittests/stubs/qcamerainfodata.cpp (+30/-0) unittests/stubs/qcamerainfodata.h (+39/-0) |
| To merge this branch: | bzr merge lp://staging/qtubuntu-camera/staging |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
New release:
- Make it possible to set camera's captureMode before the camera stack is loaded.
- Implement qtmultimedia APIs to query the system for available cameras, their orientation and facing and replace some hardcoded logic to calls to these APIs.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
