From 159134b4716f07eb1d4ecbaeaae6e1c342088ef0 Mon Sep 17 00:00:00 2001 From: Yaroslav Sidlovsky Date: Mon, 17 Aug 2020 08:45:16 +0000 Subject: [PATCH] fix: elisa-player fails to compile with Qt < 5.14 inversed macros to check Qt version --- src/mediaplaylistproxymodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mediaplaylistproxymodel.cpp b/src/mediaplaylistproxymodel.cpp index de82b377..32671931 100644 --- a/src/mediaplaylistproxymodel.cpp +++ b/src/mediaplaylistproxymodel.cpp @@ -711,12 +711,12 @@ void MediaPlayListProxyModel::loadPlayListLoaded() auto newTracks = DataTypes::EntryDataList{}; for (int i = 0; i < d->mLoadPlaylist.mediaCount(); ++i) { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) newTracks.push_back({{{{DataTypes::ElementTypeRole, ElisaUtils::FileName}, {DataTypes::ResourceRole, d->mLoadPlaylist.media(i).request().url()}}}, {}, {}}); #else newTracks.push_back({{{{DataTypes::ElementTypeRole, ElisaUtils::FileName}, - {DataTypes::ResourceRole, d->mLoadPlaylist.media(i).request().url()}}}, {}, {}}); + {DataTypes::ResourceRole, d->mLoadPlaylist.media(i).canonicalUrl()}}}, {}, {}}); #endif } -- GitLab