← Back to branch summary

~schwann/qtubuntu-camera/qtcamera-no-thumbnails

~schwann/qtubuntu-camera/qtcamera-no-thumbnails

« back to all changes in this revision

Viewing changes to src/aalcamerazoomcontrol.cpp

Committer: Tarmac
Author(s): Ricardo Salveti de Araujo
Date: 2013-06-05 16:59:21 UTC
mfrom: (48.1.1 qtubuntu-camera)
Revision ID: tarmac-20130605165921-a60sg64u69fkz41l

Fixing hybris include paths and start depending on platform-api.

Approved by PS Jenkins bot, Łukasz Zemczak.

files modified:
debian/control

src/aalcameracontrol.cpp

src/aalcameraflashcontrol.cpp

src/aalcameraflashcontrol.h

src/aalcamerafocuscontrol.h

src/aalcameraservice.cpp

src/aalcamerazoomcontrol.cpp

src/aalimagecapturecontrol.cpp

src/aalimageencodercontrol.cpp

src/aalvideodeviceselectorcontrol.cpp

src/aalvideorenderercontrol.cpp

src/aalviewfindersettingscontrol.cpp

src/src.pro

unittests/aalcamerafocuscontrol/aalimagecapturecontrol.cpp

unittests/aalcamerazoomcontrol/aalcameraservice.cpp

unittests/mocks/aal/camera_compatibility_layer.cpp

Show diffs side-by-side

added added

removed removed

src/aalcamerazoomcontrol.cpp

19

19

20

20

#include <QDebug>

21

21

22

#include "camera_compatibility_layer.h"

23

#include "camera_compatibility_layer_capabilities.h"

22

#include <hybris/camera/camera_compatibility_layer.h>

23

#include <hybris/camera/camera_compatibility_layer_capabilities.h>

24

24

25

25

AalCameraZoomControl::AalCameraZoomControl(AalCameraService *service, QObject *parent)

26

26

: QCameraZoomControl(parent),

Older »