Android: add libQt5MultimediaQuick_p to the list of dependencies.
authorChristian Strømme <christian.stromme@digia.com>
Tue, 14 May 2013 08:14:39 +0000 (10:14 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 23 May 2013 09:56:37 +0000 (11:56 +0200)
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>
src/multimedia/multimedia.pro

index 12278f5..f04bbd3 100644 (file)
@@ -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