← Back to branch summary

~thomas-voss/qtubuntu-camera/temporarily-disable-audio-recording

~thomas-voss/qtubuntu-camera/temporarily-disable-audio-recording

Viewing all changes in revision 154.

Committer: CI Train Bot
Date: 2015-12-10 15:29:37 UTC
mfrom: (153.1.2 qtubuntu-camera)
Revision ID: ci-train-bot@canonical.com-20151210152937-1fe6banpl9ju3yyw

Resync trunk.

files added:
.qmake.conf

files modified:
aalCamera.pro

debian/changelog

debian/control

src/aalcameracontrol.cpp

src/aalcameraflashcontrol.cpp

src/aalcameraflashcontrol.h

src/aalcamerafocuscontrol.cpp

src/aalcameraservice.cpp

src/aalcameraservice.h

src/aalcamerazoomcontrol.cpp

src/aalcamerazoomcontrol.h

src/aalimagecapturecontrol.cpp

src/aalimagecapturecontrol.h

src/aalimageencodercontrol.cpp

src/aalimageencodercontrol.h

src/aalvideodeviceselectorcontrol.cpp

src/aalvideoencodersettingscontrol.cpp

src/aalvideorenderercontrol.cpp

src/aalviewfindersettingscontrol.cpp

src/aalviewfindersettingscontrol.h

src/src.pro

unittests/aalcameracontrol/aalcameraservice.cpp

unittests/aalcameraexposurecontrol/aalcameraservice.cpp

unittests/aalcameraflashcontrol/aalcameraservice.cpp

unittests/aalcamerafocuscontrol/aalcameraservice.cpp

unittests/aalcamerazoomcontrol/aalcameraservice.cpp

unittests/aalcamerazoomcontrol/tst_aalcamerazoomcontrol.cpp

unittests/aalimagecapturecontrol/aalcameraservice.cpp

unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp

unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp

unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp

unittests/aalvideodeviceselectorcontrol/aalimageencodercontrol.cpp

unittests/aalviewfindersettingscontrol/aalcameraservice.cpp

unittests/mocks/aal/camera_compatibility_layer.cpp

unittests/mocks/aal/camera_compatibility_layer_capabilities.h

unittests/stubs/aalcameraservice_stub.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

src/aalcameracontrol.cpp

src/aalcameraflashcontrol.cpp

src/aalcameraflashcontrol.h

src/aalcamerafocuscontrol.cpp

src/aalcameraservice.cpp

src/aalcameraservice.h

src/aalcamerazoomcontrol.cpp

src/aalcamerazoomcontrol.h

src/aalimagecapturecontrol.cpp

src/aalimagecapturecontrol.h

src/aalimageencodercontrol.cpp

src/aalimageencodercontrol.h

src/aalvideodeviceselectorcontrol.cpp

src/aalvideoencodersettingscontrol.cpp

src/aalvideorenderercontrol.cpp

src/aalviewfindersettingscontrol.cpp

src/aalviewfindersettingscontrol.h

unittests/aalcameracontrol/aalcameraservice.cpp

unittests/aalcameraexposurecontrol/aalcameraservice.cpp

unittests/aalcameraflashcontrol/aalcameraservice.cpp

unittests/aalcamerafocuscontrol/aalcameraservice.cpp

unittests/aalcamerazoomcontrol/aalcameraservice.cpp

unittests/aalcamerazoomcontrol/tst_aalcamerazoomcontrol.cpp

unittests/aalimagecapturecontrol/aalcameraservice.cpp

unittests/aalimagecapturecontrol/aalimageencodercontrol.cpp

unittests/aalimagecapturecontrol/tst_aalimagecapturecontrol.cpp

unittests/aalvideodeviceselectorcontrol/aalcameraservice.cpp

unittests/aalvideodeviceselectorcontrol/aalimageencodercontrol.cpp

unittests/aalviewfindersettingscontrol/aalcameraservice.cpp

unittests/mocks/aal/camera_compatibility_layer.cpp

unittests/mocks/aal/camera_compatibility_layer_capabilities.h

unittests/stubs/aalcameraservice_stub.cpp

Older »