diff options
| -rw-r--r-- | qmmp.pri | 2 | ||||
| -rw-r--r-- | src/qmmpui/playlisttask.cpp | 8 | ||||
| -rw-r--r-- | src/qmmpui/radioitemdelegate.cpp | 8 |
3 files changed, 15 insertions, 3 deletions
@@ -14,7 +14,7 @@ RCC_DIR=./.build/rcc DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS unix:DEFINES += QMMP_WS_X11 -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400 QT_DEPRECATED_WARNINGS #Configuration diff --git a/src/qmmpui/playlisttask.cpp b/src/qmmpui/playlisttask.cpp index be7feb3b2..adc37f896 100644 --- a/src/qmmpui/playlisttask.cpp +++ b/src/qmmpui/playlisttask.cpp @@ -69,12 +69,20 @@ static bool _numberGreaterComparator(TrackField* s1, TrackField* s2) //by file creation date static bool _fileCreationDateLessComparator(TrackField* s1, TrackField* s2) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + return QFileInfo(s1->value).birthTime() < QFileInfo(s2->value).birthTime(); +#else return QFileInfo(s1->value).created() < QFileInfo(s2->value).created(); +#endif } static bool _fileCreationDateGreaterComparator(TrackField* s1, TrackField* s2) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + return QFileInfo(s1->value).birthTime() > QFileInfo(s2->value).birthTime(); +#else return QFileInfo(s1->value).created() > QFileInfo(s2->value).created(); +#endif } //by file modification date static bool _fileModificationDateLessComparator(TrackField* s1, TrackField* s2) diff --git a/src/qmmpui/radioitemdelegate.cpp b/src/qmmpui/radioitemdelegate.cpp index 992ba7fe8..2021936e1 100644 --- a/src/qmmpui/radioitemdelegate.cpp +++ b/src/qmmpui/radioitemdelegate.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2012-2016 by Ilya Kotov * + * Copyright (C) 2012-2018 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -102,7 +102,11 @@ bool RadioItemDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, QModelIndex parentItem = index.parent(); for (int i = 0; i < model->rowCount(parentItem); ++i) { - QModelIndex childIndex = parentItem.child(i,0); +#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) + QModelIndex childIndex = model->index(i, 0, parentItem); +#else + QModelIndex childIndex = parentItem.child(i, 0); +#endif if (childIndex != index) model->setData(childIndex, Qt::Unchecked, Qt::CheckStateRole); } |