diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:50:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:50:11 +0200 |
| commit | 9785766067aea72da13b1c7821295254d4fabb78 (patch) | |
| tree | 566c94b7074fbbffaf18e01eaf0c4f988744c712 /src/multimedia/multimedia.pro | |
| parent | 0ef52f01029176a8fb8fbef2c22ae9350635ebe1 (diff) | |
| parent | 3d45b9147ec93c4af38aef5e6ab2302681bb1425 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
Diffstat (limited to 'src/multimedia/multimedia.pro')
| -rw-r--r-- | src/multimedia/multimedia.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 31c438acb..726f00ab4 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 |