Merge pull request #5910 from lemondrops/qt6

Fix build failures with Qt 6
This commit is contained in:
Miran Grča
2025-08-08 00:15:20 +02:00
committed by GitHub
2 changed files with 4 additions and 0 deletions

View File

@@ -33,7 +33,9 @@ VMManagerConfig::VMManagerConfig(const ConfigType type, const QString& section)
config_type = type;
settings = new QSettings(configFile, QSettings::IniFormat, this);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
settings->setIniCodec("UTF-8");
#endif
settings->setFallbacksEnabled(false);
if(type == ConfigType::System && !section.isEmpty()) {
settings->beginGroup(section);

View File

@@ -234,7 +234,9 @@ VMManagerSystem::loadSettings()
}
// qInfo() << "Loaded "<< config_file.filePath() << "status:" << settings.status();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
settings.setIniCodec("UTF-8");
#endif
// Clear out the config hash in case the config is reloaded
for (const auto &outer_key : config_hash.keys()) {
config_hash[outer_key].clear();