diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 1bc84c5c0..b5cabaf10 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -26,7 +26,7 @@ https://github.com/sponsors/martinrotter - + none diff --git a/resources/scripts/github-actions/build-windows.ps1 b/resources/scripts/github-actions/build-windows.ps1 index 4cc50a1b2..81c9afa87 100755 --- a/resources/scripts/github-actions/build-windows.ps1 +++ b/resources/scripts/github-actions/build-windows.ps1 @@ -19,11 +19,11 @@ $AllProtocols = [System.Net.SecurityProtocolType]'Tls11,Tls12' $ProgressPreference = 'SilentlyContinue' # Get and prepare needed dependencies. -$qt_version = "6.2.3" +$qt_version = "5.15.2" $maria_version = "10.6.7" $maria_link = "https://archive.mariadb.org/mariadb-$maria_version/winx64-packages/mariadb-$maria_version-winx64.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_output = "cmake.zip" diff --git a/src/librssguard/database/databasequeries.cpp b/src/librssguard/database/databasequeries.cpp index c2eac5148..f83aa101c 100644 --- a/src/librssguard/database/databasequeries.cpp +++ b/src/librssguard/database/databasequeries.cpp @@ -2541,5 +2541,5 @@ bool DatabaseQueries::storeNewOauthTokens(const QSqlDatabase& db, } QString DatabaseQueries::unnulifyString(const QString& str) { - return str.isNull() ? QL1S("") : str; + return str.isNull() ? QSL("") : str; } diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp index 7b8d5506c..c46aae139 100644 --- a/src/rssguard/main.cpp +++ b/src/rssguard/main.cpp @@ -14,6 +14,8 @@ #endif #endif +#include + #if defined(Q_OS_MACOS) extern void disableWindowTabbing(); #endif @@ -61,6 +63,10 @@ int main(int argc, char* argv[]) { raw_cli_args << QString::fromLocal8Bit(av[a]); } +#if QT_VERSION_MAJOR == 5 + QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); +#endif + // Instantiate base application object. Application application(QSL(APP_LOW_NAME), argc, argv, raw_cli_args);