FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build for QSet.

Browse Source
This commit is contained in:
Martin Rotter 2020-05-07 08:40:57 +02:00
parent 5dbd4579ed
commit dde22b4828
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -1,6 +1,5 @@
language: cpp language: cpp
osx_image: xcode9.4 osx_image: xcode9.4
sudo: required
dist: xenial dist: xenial
os: os:
- linux - linux
@ -15,7 +14,6 @@ notifications:
deploy: deploy:
- provider: releases - provider: releases
file_glob: true file_glob: true
skip_cleanup: true
api_key: $GH_TOKEN api_key: $GH_TOKEN
file: file:
- rssguard-build/src/rssguard/rss*.AppImage - rssguard-build/src/rssguard/rss*.AppImage
@ -27,7 +25,6 @@ deploy:
file: .travis-bintray-desc.json file: .travis-bintray-desc.json
user: martinrotter user: martinrotter
key: $BINTRAY_KEY key: $BINTRAY_KEY
skip_cleanup: true
on: on:
all_branches: true all_branches: true

2
resources/text/CHANGELOG
View File

@ -8,7 +8,6 @@ Fixed/changed:
▪ Translations synced. ▪ Translations synced.
▪ Big code refactoring, fixed almost all usages of Qt deprecated code. ▪ Big code refactoring, fixed almost all usages of Qt deprecated code.
▪ Completely overhauled Appveyor/Travis build scripts which are now more reliable. ▪ Completely overhauled Appveyor/Travis build scripts which are now more reliable.
▪
3.6.0 3.6.0
————— —————
@ -36,7 +35,6 @@ Fixed/changed:
▪ Tray icon now shows correct number of unread messages upon app startup. ▪ Tray icon now shows correct number of unread messages upon app startup.
▪ Some resources are now installed to correct locations when using NSIS installer. ▪ Some resources are now installed to correct locations when using NSIS installer.
▪ Many fixes for build scripts for dev builds. ▪ Many fixes for build scripts for dev builds.
▪
3.5.9 3.5.9
————— —————

12
src/librssguard/services/abstract/cacheforserviceroot.cpp
View File

@ -22,8 +22,14 @@ void CacheForServiceRoot::addMessageStatesToCache(const QList<Message>& ids_of_m
// Store changes, they will be sent to server later. // Store changes, they will be sent to server later.
list_act.append(ids_of_messages); list_act.append(ids_of_messages);
#if QT_VERSION >= 0x050E00 // Qt >= 5.14.0
QSet<Message> set_act(list_act.begin(), list_act.end()); QSet<Message> set_act(list_act.begin(), list_act.end());
QSet<Message> set_other(list_other.begin(), list_other.end()); QSet<Message> set_other(list_other.begin(), list_other.end());
#else
QSet<Message> set_act = list_act.toSet();
QSet<Message> set_other = list_other.toSet();
#endif
// Now, we want to remove all IDS from list_other, which are contained in list. // Now, we want to remove all IDS from list_other, which are contained in list.
set_other -= set_act; set_other -= set_act;
@ -43,8 +49,14 @@ void CacheForServiceRoot::addMessageStatesToCache(const QStringList& ids_of_mess
// Store changes, they will be sent to server later. // Store changes, they will be sent to server later.
list_act.append(ids_of_messages); list_act.append(ids_of_messages);
#if QT_VERSION >= 0x050E00 // Qt >= 5.14.0
QSet<QString> set_act(list_act.begin(), list_act.end()); QSet<QString> set_act(list_act.begin(), list_act.end());
QSet<QString> set_other(list_other.begin(), list_other.end()); QSet<QString> set_other(list_other.begin(), list_other.end());
#else
QSet<QString> set_act = list_act.toSet();
QSet<QString> set_other = list_other.toSet();
#endif
// Now, we want to remove all IDS from list_other, which are contained in list. // Now, we want to remove all IDS from list_other, which are contained in list.
set_other -= set_act; set_other -= set_act;