pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

os2 compatibility

Browse source
This commit is contained in:
Martin Rotter 2021-02-22 13:42:23 +01:00
parent 7ad65b0044
commit 5f49c2b015
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librssguard/librssguard.pro
View file

@ -511,8 +511,8 @@ QMAKE_EXTRA_TARGETS += lupdate
# Make sure QM translations are nerated. # Make sure QM translations are nerated.
qtPrepareTool(LRELEASE, lrelease) { qtPrepareTool(LRELEASE, lrelease) {
message($$MSG_PREFIX: Running: \"$$LRELEASE\" -compress librssguard.pro) message($$MSG_PREFIX: Running: \"$$LRELEASE\" -compress $$shell_quote($$shell_path($$PWD/librssguard.pro)))
system($$LRELEASE -compress librssguard.pro) system($$LRELEASE -compress $$shell_quote($$shell_path($$PWD/librssguard.pro)))
} }
mac { mac {

7
src/librssguard/services/standard/standardfeed.cpp
View file

@ -659,7 +659,12 @@ QList<Message> StandardFeed::obtainNewMessages(bool* error_during_obtaining) {
} }
QStringList StandardFeed::prepareExecutionLine(const QString& execution_line) { QStringList StandardFeed::prepareExecutionLine(const QString& execution_line) {
auto split_exec = execution_line.split('#', Qt::SplitBehaviorFlags::SkipEmptyParts); auto split_exec = execution_line.split('#',
#if QT_VERSION >= 0x050F00 // Qt >= 5.15.0
Qt::SplitBehaviorFlags::SkipEmptyParts);
#else
QString::SplitBehavior::SkipEmptyParts);
#endif
auto user_data_folder = qApp->userDataFolder(); auto user_data_folder = qApp->userDataFolder();
return split_exec.replaceInStrings(EXECUTION_LINE_USER_DATA_PLACEHOLDER, user_data_folder); return split_exec.replaceInStrings(EXECUTION_LINE_USER_DATA_PLACEHOLDER, user_data_folder);