Merge branch 'qt_fix' into 'master'

Register language selector properly Closes #7727 See merge request OpenMW/openmw!3666
OpenMW · Dec 20, 2023 · 7074ea0 · 7074ea0
2 parents 36b61d7 + 8d06a99
commit 7074ea0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp
@@ -124,7 +124,7 @@ void Wizard::InstallationPage::startInstallation()
     mUnshield->setPath(path);
 
     // Set the right codec to use for Morrowind.ini
-    QString language(field(QLatin1String("installation.language")).value<QComboBox*>()->currentData().toString());
+    QString language(field(QLatin1String("installation.language")).toString());
 
     if (language == QLatin1String("Polish"))
     {

diff --git a/apps/wizard/languageselectionpage.cpp b/apps/wizard/languageselectionpage.cpp
@@ -9,7 +9,7 @@ Wizard::LanguageSelectionPage::LanguageSelectionPage(QWidget* parent)
 
     setupUi(this);
 
-    registerField(QLatin1String("installation.language"), languageComboBox);
+    registerField(QLatin1String("installation.language"), languageComboBox, "currentData", "currentDataChanged");
 }
 
 void Wizard::LanguageSelectionPage::initializePage()

diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp
@@ -270,7 +270,7 @@ void Wizard::MainWizard::runSettingsImporter()
     arguments.append(QLatin1String("--encoding"));
 
     // Set encoding
-    QString language(field(QLatin1String("installation.language")).value<QComboBox*>()->currentData().toString());
+    QString language(field(QLatin1String("installation.language")).toString());
     if (language == QLatin1String("Polish"))
     {
         arguments.append(QLatin1String("win1250"));
@@ -391,7 +391,7 @@ void Wizard::MainWizard::reject()
 void Wizard::MainWizard::writeSettings()
 {
     // Write the encoding and language settings
-    QString language(field(QLatin1String("installation.language")).value<QComboBox*>()->currentData().toString());
+    QString language(field(QLatin1String("installation.language")).toString());
     mLauncherSettings.setLanguage(language);
 
     if (language == QLatin1String("Polish"))