chore(cpn): upgrade to Ubuntu 22.04 and Qt 6.9.0 (#5986)

Co-authored-by: elecpower <elecpower@users.noreply.github.com>
Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
Neil Horne
2025-07-23 14:04:19 +02:00
committed by GitHub
co-authored by elecpower raphaelcoeffic
parent 7264b28e62
commit 9e86a3ea84
117 changed files with 4221 additions and 5155 deletions
+3 -6
View File
@@ -81,8 +81,7 @@ QStringList const Translations::getTranslationPaths()
// Then the resource file
paths << APP_TRANSLATIONS_RESOURCE_PATH;
// Finally the system folder (more likely for Qt translations than Companion ones)
paths << QLibraryInfo::location(QLibraryInfo::TranslationsPath);
paths << QLibraryInfo::path(QLibraryInfo::TranslationsPath);
return paths;
}
@@ -103,7 +102,8 @@ void Translations::installTranslators()
g.locale("");
}
}
qDebug() << "Locale name:" << locale.name() << "language:" << locale.nativeLanguageName() << "country:" << locale.nativeCountryName();
qDebug() << "Locale name:" << locale.name() << "language:" << locale.nativeLanguageName() << "country:" << locale.nativeTerritoryName();
// Remove any existing translators, this lets us re-translate w/out restart.
foreach (QTranslator * t, appTranslators) {
@@ -125,10 +125,7 @@ void Translations::installTranslators()
// First try to install Qt translations for common GUI elements.
QStringList qtFiles = QStringList() << "qt";
// After Qt5.3 some translation files are broken up into modules. We only need "qtbase" for now.
#if (QT_VERSION >= QT_VERSION_CHECK(5, 3, 0))
qtFiles << "qtbase";
#endif
foreach (const QString & qtfile, qtFiles) {
QTranslator * translator = new QTranslator(qApp);