diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:02:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-13 03:02:16 +0200 |
| commit | 477125deb6d76f8e0b2a837c00fd99649065a388 (patch) | |
| tree | 00a1b03ef2d3e16e1dee7be9c8017b3b8b9f4084 | |
| parent | 7750d9014ee38cffe349af5c50f715774e7b1982 (diff) | |
| parent | fc33195f87d7b2b036f1df625a8fda12557e05e4 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Ic398983a0a680738487476150e28593665db3fb2
| -rw-r--r-- | src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java index b1da2f1fa..647cc7fe0 100644 --- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java +++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtAndroidMediaPlayer.java @@ -378,7 +378,7 @@ public class QtAndroidMediaPlayer FileDescriptor fd = fis.getFD(); mMediaPlayer.setDataSource(fd); } else { - mMediaPlayer.setDataSource(mContext, mUri); + mMediaPlayer.setDataSource(path); } setState(State.Initialized); } catch (final IOException e) { |