diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2014-02-10 19:33:51 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@digia.com> | 2014-07-17 18:58:00 +0200 |
commit | 888759e334e81117843afb6d0f8991db8aec5ca8 (patch) | |
tree | d0b6eb0b094557d5c25bf865998915f0839d596d /tests/auto/unit/qmultimedia_common | |
parent | cddbe8736d995b4bfdfbbf1abfc3d6aeae3eb214 (diff) | |
download | qtmultimedia-888759e334e81117843afb6d0f8991db8aec5ca8.tar.gz |
New camera selection API in QML.
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>
Diffstat (limited to 'tests/auto/unit/qmultimedia_common')
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mock.pri | 2 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockcamera.pri | 6 | ||||
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mock.pri b/tests/auto/unit/qmultimedia_common/mock.pri index 269981a86..94a17a615 100644 --- a/tests/auto/unit/qmultimedia_common/mock.pri +++ b/tests/auto/unit/qmultimedia_common/mock.pri @@ -1,5 +1,5 @@ INCLUDEPATH += $$PWD \ - ../../../src/multimedia \ + ../../../../src/multimedia \ HEADERS *= \ ../qmultimedia_common/mockmediaserviceprovider.h \ diff --git a/tests/auto/unit/qmultimedia_common/mockcamera.pri b/tests/auto/unit/qmultimedia_common/mockcamera.pri index c12ac3c62..dbd7312b2 100644 --- a/tests/auto/unit/qmultimedia_common/mockcamera.pri +++ b/tests/auto/unit/qmultimedia_common/mockcamera.pri @@ -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 \ diff --git a/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h b/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h index 6bf221c50..8ab813229 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h @@ -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" |