diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:26:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-11 23:26:39 +0200 |
| commit | 0a05ae544693c10a30e4cfd9c1460f193f252a3f (patch) | |
| tree | 603ebe744fbb1bfe5e72f06c9aa4d4727b7012b7 /src/multimedia/multimedia.pro | |
| parent | 0a3f1aacd38cc447bc85032a4ae2509ae472af94 (diff) | |
| parent | e15a2b92b6120a119cf218ab0f0630f23bc45ba5 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia2cf3c55e57d7ac17f02965915fa6933ff2c8cce
Diffstat (limited to 'src/multimedia/multimedia.pro')
| -rw-r--r-- | src/multimedia/multimedia.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 726f00ab4..265728552 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -52,9 +52,9 @@ include(recording/recording.pri) include(video/video.pri) ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtMultimedia-bundled.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer + jar/QtMultimedia-bundled.jar ANDROID_JAR_DEPENDENCIES = \ - jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer + jar/QtMultimedia.jar ANDROID_LIB_DEPENDENCIES = \ plugins/mediaservice/libandroidmediaplayer.so \ lib/libQt5MultimediaQuick_p.so:Qt5Quick |