summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Strømme <christian.stromme@digia.com>2013-05-14 10:14:39 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-23 11:56:37 +0200
commit94652ea6dd04fda9aab9d19467d8598d118d0502 (patch)
tree470168ba3f9cf649f37ffcd66a059339a7854cac /src
parent5c087bb6153b951e1c5709ee7f998819d08a6122 (diff)
Android: add libQt5MultimediaQuick_p to the list of dependencies.
libQt5MultimediaQuick_p is first loaded as a result of a qml import, and is therefore not detected as a dependency. Note that libQt5MultimediaQuick_p will only be added as a dependency if QtQuick is used. Task-number: QTBUG-30861 Change-Id: I8ce818ef1648302bbbbdf63ef133185a66b66cca Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/multimedia/multimedia.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 12278f5eb..f04bbd326 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -56,7 +56,10 @@ ANDROID_BUNDLED_JAR_DEPENDENCIES = \
ANDROID_JAR_DEPENDENCIES = \
jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
ANDROID_LIB_DEPENDENCIES = \
- plugins/mediaservice/libandroidmediaplayer.so
+ plugins/mediaservice/libandroidmediaplayer.so \
+ lib/libQt5MultimediaQuick_p.so:Qt5Quick
+ANDROID_BUNDLED_FILES += \
+ lib/libQt5MultimediaQuick_p.so
MODULE_PLUGIN_TYPES = \
mediaservice