4 files changed, 6 insertions, 15 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index afea8e147..f52041e5f 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -142,7 +142,7 @@ public:
     QMediaContent rootMedia;
     QMediaContent pendingPlaylist;
     QMediaPlaylist *parentPlaylist(QMediaPlaylist *pls);
-    bool isInChain(QUrl url);
+    bool isInChain(const QUrl &url);
     int nestedPlaylists;
 
     void setMedia(const QMediaContent &media, QIODevice *stream = 0);
@@ -175,7 +175,7 @@ QMediaPlaylist *QMediaPlayerPrivate::parentPlaylist(QMediaPlaylist *pls)
     return 0;
 }
 
-bool QMediaPlayerPrivate::isInChain(QUrl url)
+bool QMediaPlayerPrivate::isInChain(const QUrl &url)
 {
     // Check whether a URL is already in the chain of playlists.
     // Also see a comment in parentPlaylist().
diff --git a/src/multimedia/qmediaopenglhelper_p.h b/src/multimedia/qmediaopenglhelper_p.h
index 602116976..0a65b9f53 100644
--- a/src/multimedia/qmediaopenglhelper_p.h
+++ b/src/multimedia/qmediaopenglhelper_p.h
@@ -72,7 +72,7 @@ inline bool QMediaOpenGLHelper::isANGLE()
 #else
     bool isANGLE = false;
 
-# if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC))
+# if defined(Q_OS_WIN) && (defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC))
     if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES) {
         // Although unlikely, technically LibGLES could mean a non-ANGLE EGL/GLES2 implementation too.
         // Verify that it is indeed ANGLE.
@@ -104,7 +104,7 @@ inline bool QMediaOpenGLHelper::isANGLE()
 #  endif // QT_OPENGL_ES_2_ANGLE_STATIC
 
     }
-# endif // Q_OS_WIN && !Q_OS_WINCE && (QT_OPENGL_ES_2 || QT_OPENGL_DYNAMIC)
+# endif // Q_OS_WIN && (QT_OPENGL_ES_2 || QT_OPENGL_DYNAMIC)
 
     return isANGLE;
 #endif // Q_OS_WINRT
diff --git a/src/multimedia/qmediastoragelocation.cpp b/src/multimedia/qmediastoragelocation.cpp
index 04aa79758..7bd1e84f4 100644
--- a/src/multimedia/qmediastoragelocation.cpp
+++ b/src/multimedia/qmediastoragelocation.cpp
@@ -131,7 +131,7 @@ QString QMediaStorageLocation::generateFileName(const QString &prefix,
                                                .arg(extension);
 
         const QString path = dir.absoluteFilePath(name);
-        if (!QFileInfo(path).exists()) {
+        if (!QFileInfo::exists(path)) {
             m_lastUsedIndex[lastMediaKey] = lastMediaIndex + 1;
             return path;
         }
diff --git a/src/multimedia/qmediatimerange.cpp b/src/multimedia/qmediatimerange.cpp
index 7739c704f..700dcd087 100644
--- a/src/multimedia/qmediatimerange.cpp
+++ b/src/multimedia/qmediatimerange.cpp
@@ -665,16 +665,7 @@ bool QMediaTimeRange::contains(qint64 time) const
 */
 bool operator==(const QMediaTimeRange &a, const QMediaTimeRange &b)
 {
-    if (a.intervals().count() != b.intervals().count())
-        return false;
-
-    for (int i = 0; i < a.intervals().count(); i++)
-    {
-        if(a.intervals()[i] != b.intervals()[i])
-            return false;
-    }
-
-    return true;
+    return a.intervals() == b.intervals();
 }
 
 /*!