diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index aaf911c5..c07474b2 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -400,13 +400,11 @@ void QMediaPlayerPrivate::_q_handlePlaylistLoaded() { Q_Q(QMediaPlayer); - QMediaPlaylist *oldPlaylist = 0; if (pendingPlaylist.playlist()) { Q_ASSERT(!q->currentMedia().playlist()); // if there is an active playlist if (playlist) { Q_ASSERT(playlist->currentIndex() >= 0); - oldPlaylist = playlist; disconnectPlaylist(); playlist->insertMedia(playlist->currentIndex() + 1, pendingPlaylist); playlist->removeMedia(playlist->currentIndex()); diff --git a/src/multimedia/qmediaresourceset_p.cpp b/src/multimedia/qmediaresourceset_p.cpp index a440c82f..fddaaaed 100644 --- a/src/multimedia/qmediaresourceset_p.cpp +++ b/src/multimedia/qmediaresourceset_p.cpp @@ -50,7 +50,7 @@ QMediaPlayerResourceSetInterface::QMediaPlayerResourceSetInterface(QObject *pare QString QMediaPlayerResourceSetInterface::iid() { - return QString(QMediaPlayerResourceSetInterface_iid); + return QLatin1String(QMediaPlayerResourceSetInterface_iid); } QT_END_NAMESPACE