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

fixed #579

Browse Source
This commit is contained in:
Martin Rotter 2022-03-22 08:14:41 +01:00
parent 9939d76d44
commit e227a8db1b
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View File

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url> <url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="4.2.0" date="2022-03-21"/> <release version="4.2.0" date="2022-03-22"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

4
resources/scripts/github-actions/build-windows.ps1
View File

@ -19,11 +19,11 @@ $AllProtocols = [System.Net.SecurityProtocolType]'Tls11,Tls12'
$ProgressPreference = 'SilentlyContinue' $ProgressPreference = 'SilentlyContinue'
# Get and prepare needed dependencies. # Get and prepare needed dependencies.
$qt_version = "6.2.3" $qt_version = "5.15.2"
$maria_version = "10.6.7" $maria_version = "10.6.7"
$maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip" $maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.zip"
$maria_output = "maria.zip" $maria_output = "maria.zip"
$cmake_version = "3.22.2" $cmake_version = "3.22.3"
$cmake_link = "https://github.com/Kitware/CMake/releases/download/v$cmake_version/cmake-$cmake_version-windows-x86_64.zip" $cmake_link = "https://github.com/Kitware/CMake/releases/download/v$cmake_version/cmake-$cmake_version-windows-x86_64.zip"
$cmake_output = "cmake.zip" $cmake_output = "cmake.zip"

2
src/librssguard/database/databasequeries.cpp
View File

@ -2541,5 +2541,5 @@ bool DatabaseQueries::storeNewOauthTokens(const QSqlDatabase& db,
} }
QString DatabaseQueries::unnulifyString(const QString& str) { QString DatabaseQueries::unnulifyString(const QString& str) {
return str.isNull() ? QL1S("") : str; return str.isNull() ? QSL("") : str;
} }

6
src/rssguard/main.cpp
View File

@ -14,6 +14,8 @@
#endif #endif
#endif #endif
#include <QTextCodec>
#if defined(Q_OS_MACOS) #if defined(Q_OS_MACOS)
extern void disableWindowTabbing(); extern void disableWindowTabbing();
#endif #endif
@ -61,6 +63,10 @@ int main(int argc, char* argv[]) {
raw_cli_args << QString::fromLocal8Bit(av[a]); raw_cli_args << QString::fromLocal8Bit(av[a]);
} }
#if QT_VERSION_MAJOR == 5
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
#endif
// Instantiate base application object. // Instantiate base application object.
Application application(QSL(APP_LOW_NAME), argc, argv, raw_cli_args); Application application(QSL(APP_LOW_NAME), argc, argv, raw_cli_args);