mirror of
https://github.com/martinrotter/rssguard.git
synced 2025-01-28 16:20:34 +01:00
fixed #579
This commit is contained in:
parent
9939d76d44
commit
e227a8db1b
@ -26,7 +26,7 @@
|
||||
<url type="donation">https://github.com/sponsors/martinrotter</url>
|
||||
<content_rating type="oars-1.1" />
|
||||
<releases>
|
||||
<release version="4.2.0" date="2022-03-21"/>
|
||||
<release version="4.2.0" date="2022-03-22"/>
|
||||
</releases>
|
||||
<content_rating type="oars-1.0">
|
||||
<content_attribute id="violence-cartoon">none</content_attribute>
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -14,6 +14,8 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <QTextCodec>
|
||||
|
||||
#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);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user