diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:15:45 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 13:15:45 +0200 |
| commit | 0ef52f01029176a8fb8fbef2c22ae9350635ebe1 (patch) | |
| tree | fad805097d0e40ba57dcfb61ac3067737c7a2ae3 /src/multimedia/multimedia.pro | |
| parent | cb324a50c920b275ef6c04162712b1a6f19bbe8d (diff) | |
| parent | 5c087bb6153b951e1c5709ee7f998819d08a6122 (diff) | |
| download | qtmultimedia-0ef52f01029176a8fb8fbef2c22ae9350635ebe1.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
Diffstat (limited to 'src/multimedia/multimedia.pro')
| -rw-r--r-- | src/multimedia/multimedia.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 61dfb3d08..31c438acb 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -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 |