Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Elisa
Commits
159134b4
Commit
159134b4
authored
Aug 17, 2020
by
Yaroslav Sidlovsky
💬
Committed by
Matthieu Gallien
Aug 17, 2020
Browse files
fix: elisa-player fails to compile with Qt < 5.14
inversed macros to check Qt version
parent
9f5c789f
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/mediaplaylistproxymodel.cpp
View file @
159134b4
...
...
@@ -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
().
u
rl
()}}},
{},
{}});
{
DataTypes
::
ResourceRole
,
d
->
mLoadPlaylist
.
media
(
i
).
canonicalU
rl
()}}},
{},
{}});
#endif
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment