diff options
author | Yoann Lopes <yoann.lopes@digia.com> | 2014-09-01 14:19:53 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-09-01 14:19:53 +0200 |
commit | bc1fa076c944c6af3250cb7210190da42a4de6ea (patch) | |
tree | b6948fa95abbdd4ffbb30b76c7d3c09ae07e51db /src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp | |
parent | 0c3438c9a12fbc607eada8f938cf0ad8fdea374d (diff) | |
parent | 659f238bbbe040cce1bdf900f8f5500845ca8727 (diff) |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4v5.4.0-alpha1
Diffstat (limited to 'src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp')
-rw-r--r-- | src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp b/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp index 00e8b6184..05cee3b9d 100644 --- a/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp +++ b/src/plugins/android/src/mediaplayer/qandroidmediaservice.cpp @@ -45,8 +45,8 @@ QAndroidMediaService::QAndroidMediaService(QObject *parent) { mMediaControl = new QAndroidMediaPlayerControl; mMetadataControl = new QAndroidMetaDataReaderControl; - connect(mMediaControl, SIGNAL(mediaChanged(QMediaContent)), - mMetadataControl, SLOT(onMediaChanged(QMediaContent))); + connect(mMediaControl, SIGNAL(actualMediaLocationChanged(QString)), + mMetadataControl, SLOT(onMediaChanged(QString))); connect(mMediaControl, SIGNAL(metaDataUpdated()), mMetadataControl, SLOT(onUpdateMetaData())); } |