diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 03:01:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-20 03:01:42 +0200 |
| commit | 023c48830386566042497bfac2a01c713bc5423b (patch) | |
| tree | b3308e3074e3f8169b9817009623d9ed4996538f /src/plugins/android | |
| parent | b62ade1c474026dc2300ad25be02bba28d32096f (diff) | |
| parent | 30cbbd98e7159de08bb71ab4332dbd0bab19eba5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Id4521553c437efa66ad52b2e419b446184a0ec11
Diffstat (limited to 'src/plugins/android')
| -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) { |