Revert "DolphinQt: Minor consistency fixes for the Settings window"

This reverts commit 9d45bac17538bf0e64cfad025bd82109c971f9d6.

1 files changed, 18 insertions, 16 deletions

diff --git a/Source/Core/DolphinQt/Settings/GeneralPane.cpp b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
index b94bc63fcd..5aa1c4d980 100644
--- a/Source/Core/DolphinQt/Settings/GeneralPane.cpp
+++ b/Source/Core/DolphinQt/Settings/GeneralPane.cpp
@@ -175,16 +175,16 @@ void GeneralPane::CreateBasic()
 void GeneralPane::CreateAutoUpdate()
 {
   auto* auto_update_group = new QGroupBox(tr("Auto Update Settings"));
-  auto* auto_update_group_layout = new QFormLayout;
-  auto_update_group->setLayout(auto_update_group_layout);
+  auto* layout = new QFormLayout;
+  auto_update_group->setLayout(layout);
   m_main_layout->addWidget(auto_update_group);
 
-  auto_update_group_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop);
-  auto_update_group_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+  layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop);
+  layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
 
   m_combobox_update_track = new QComboBox(this);
 
-  auto_update_group_layout->addRow(tr("&Auto Update:"), m_combobox_update_track);
+  layout->addRow(tr("&Auto Update:"), m_combobox_update_track);
 
   for (const QString& option : {tr("Don't Update"), tr("Stable (once a year)"),
                                 tr("Beta (once a month)"), tr("Dev (multiple times a day)")})
@@ -194,26 +194,28 @@ void GeneralPane::CreateAutoUpdate()
 void GeneralPane::CreateFallbackRegion()
 {
   auto* fallback_region_group = new QGroupBox(tr("Fallback Region"));
-  auto* fallback_region_group_layout = new QVBoxLayout;
-  fallback_region_group->setLayout(fallback_region_group_layout);
+  auto* layout = new QVBoxLayout;
+  fallback_region_group->setLayout(layout);
   m_main_layout->addWidget(fallback_region_group);
 
-  auto* fallback_region_dropdown_layout = new QFormLayout;
-  fallback_region_dropdown_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop);
-  fallback_region_dropdown_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
-  fallback_region_group_layout->addLayout(fallback_region_dropdown_layout);
-
   m_combobox_fallback_region = new QComboBox(this);
-  fallback_region_dropdown_layout->addRow(tr("Fallback Region:"), m_combobox_fallback_region);
 
-  for (const QString& option : {tr("NTSC-J"), tr("NTSC-U"), tr("PAL"), tr("NTSC-K")})
-    m_combobox_fallback_region->addItem(option);
+  auto* form_widget = new QWidget;
+  auto* form_layout = new QFormLayout;
+  form_widget->setLayout(form_layout);
+  form_layout->setAlignment(Qt::AlignLeft | Qt::AlignTop);
+  form_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
+  form_layout->addRow(tr("Fallback Region:"), m_combobox_fallback_region);
+  layout->addWidget(form_widget);
 
   auto* fallback_region_description =
       new QLabel(tr("Dolphin will use this for titles whose region cannot be determined "
                     "automatically."));
   fallback_region_description->setWordWrap(true);
-  fallback_region_group_layout->addWidget(fallback_region_description);
+  layout->addWidget(fallback_region_description);
+
+  for (const QString& option : {tr("NTSC-J"), tr("NTSC-U"), tr("PAL"), tr("NTSC-K")})
+    m_combobox_fallback_region->addItem(option);
 }
 
 #if defined(USE_ANALYTICS) && USE_ANALYTICS