Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I7f644741677dbd848d480dde7c76cdf7ad81e4b9

1 files changed, 4 insertions, 4 deletions

diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h
index d231097f4..8b5072572 100644
--- a/src/multimedia/controls/qmediaplayercontrol.h
+++ b/src/multimedia/controls/qmediaplayercontrol.h
@@ -71,7 +71,7 @@ public:
     virtual void setVolume(int volume) = 0;
 
     virtual bool isMuted() const = 0;
-    virtual void setMuted(bool muted) = 0;
+    virtual void setMuted(bool mute) = 0;
 
     virtual int bufferStatus() const = 0;
 
@@ -100,12 +100,12 @@ Q_SIGNALS:
     void stateChanged(QMediaPlayer::State newState);
     void mediaStatusChanged(QMediaPlayer::MediaStatus status);
     void volumeChanged(int volume);
-    void mutedChanged(bool muted);
+    void mutedChanged(bool mute);
     void audioAvailableChanged(bool audioAvailable);
     void videoAvailableChanged(bool videoAvailable);
     void bufferStatusChanged(int percentFilled);
-    void seekableChanged(bool);
-    void availablePlaybackRangesChanged(const QMediaTimeRange&);
+    void seekableChanged(bool seekable);
+    void availablePlaybackRangesChanged(const QMediaTimeRange &ranges);
     void playbackRateChanged(qreal rate);
     void error(int error, const QString &errorString);