diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2013-03-25 18:11:27 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-12 12:56:57 +0200 |
| commit | 0a7882f6b308296ff9d44d891d3bdfed91679ce2 (patch) | |
| tree | 8a1e1575158d8213773fcf4e692a160bf4b301cd /src/multimedia/multimedia.pro | |
| parent | 99fff6941ba6b1929c1bd8d46dc8776a6cbf11c6 (diff) | |
| download | qtmultimedia-0a7882f6b308296ff9d44d891d3bdfed91679ce2.tar.gz | |
Android: added camera support.
This patch includes all camera features: viewport, settings, image
capture, and video recording.
It also adds support for QAudioRecorder.
Change-Id: Ib962177cc8de4bac03f42a2bc0f534e03464bbfc
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Diffstat (limited to 'src/multimedia/multimedia.pro')
| -rw-r--r-- | src/multimedia/multimedia.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index f1f4b3896..54c6e0a9b 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -52,11 +52,11 @@ include(recording/recording.pri) include(video/video.pri) ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtMultimedia-bundled.jar + jar/QtMultimedia-bundled.jar:org.qtproject.qt5.android.multimedia.QtMultimediaUtils ANDROID_JAR_DEPENDENCIES = \ - jar/QtMultimedia.jar + jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtMultimediaUtils ANDROID_LIB_DEPENDENCIES = \ - plugins/mediaservice/libandroidmediaplayer.so \ + plugins/mediaservice/libqtmedia_android.so \ lib/libQt5MultimediaQuick_p.so:Qt5Quick ANDROID_BUNDLED_FILES += \ lib/libQt5MultimediaQuick_p.so |