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

Make it possible to bundle Android builds

Browse Source 
We need to adapt to the way the jar builds are split on Android,
into a jar file which can be bundled and one which can be distributed
and loaded on the classpath.

We also need to add meta-information about which plugins the
module depends on so that they can be bundled as well.

Task-number: QTBUG-30751
Change-Id: I5cca51c3732ce72985df29672a219c3fd4fe7bac
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Eskil Abrahamsen Blomfeldt
2013-05-02 11:30:55 +02:00
committed by The Qt Project
parent 5fa32ce4d0
commit 8e202bcad1
5 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/multimedia.pro
View File

@@ -51,10 +51,14 @@ include(radio/radio.pri)
include(recording/recording.pri)
include(video/video.pri)
ANDROID_BUNDLED_JAR_DEPENDENCIES = \
jar/QtMultimedia-bundled.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
ANDROID_JAR_DEPENDENCIES = \
jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
ANDROID_LIB_DEPENDENCIES = \
plugins/mediaservice/libandroidmediaplayer.so
MODULE_PLUGIN_TYPES = \
mediaservice
mac {
LIBS += -framework AppKit -framework QuartzCore -framework QTKit