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

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Change-Id: Ia2cf3c55e57d7ac17f02965915fa6933ff2c8cce
This commit is contained in:
Frederik Gladhorn
2013-07-11 23:26:39 +02:00
parent 0a3f1aacd3 e15a2b92b6
commit 0a05ae5446
10 changed files with 158 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/multimedia.pro
View File

@@ -52,9 +52,9 @@ include(recording/recording.pri)
include(video/video.pri)
ANDROID_BUNDLED_JAR_DEPENDENCIES = \
jar/QtMultimedia-bundled.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
jar/QtMultimedia-bundled.jar
ANDROID_JAR_DEPENDENCIES = \
jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
jar/QtMultimedia.jar
ANDROID_LIB_DEPENDENCIES = \
plugins/mediaservice/libandroidmediaplayer.so \
lib/libQt5MultimediaQuick_p.so:Qt5Quick