slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New camera selection API in QML.

Browse Source 
Also added a new QtMultimedia global object which makes it possible
to retrieve the list of available cameras. It can be extended with
new utility functions in the future.

Includes documentation, example and auto tests.

Task-number: QTBUG-23770
Change-Id: Ifea076329c3582ea99246ee1131853344a7b773f
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
2014-02-10 19:33:51 +01:00
parent cddbe8736d
commit 888759e334
32 changed files with 1297 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/unit/qmultimedia_common/mock.pri
View File

@@ -1,5 +1,5 @@
INCLUDEPATH += $$PWD \
../../../src/multimedia \
../../../../src/multimedia \
HEADERS *= \
../qmultimedia_common/mockmediaserviceprovider.h \

6
tests/auto/unit/qmultimedia_common/mockcamera.pri
View File

@@ -1,8 +1,8 @@
# Camera related mock backend files
INCLUDEPATH += $$PWD \
../../../src/multimedia \
../../../src/multimedia/video \
../../../src/multimedia/camera
../../../../src/multimedia \
../../../../src/multimedia/video \
../../../../src/multimedia/camera
HEADERS *= \
../qmultimedia_common/mockcameraservice.h \

2
tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h
View File

@@ -42,7 +42,7 @@
#ifndef MOCKMEDIASERVICEPROVIDER_H
#define MOCKMEDIASERVICEPROVIDER_H
#include "private/qmediaserviceprovider_p.h"
#include "qmediaserviceprovider_p.h"
#include "qmediaservice.h"
#include "mockvideodeviceselectorcontrol.h"
#include "mockcamerainfocontrol.h"