Merge pull request #7149 from spycrab/qt_5.9

Qt: Make Qt 5.9 a hard requirement

1 files changed, 15 insertions, 16 deletions

diff --git a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
index 629a3efdb4..af39c061e1 100644
--- a/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
+++ b/Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
@@ -26,7 +26,6 @@
 #include "Core/PowerPC/PPCAnalyst.h"
 #include "Core/PowerPC/PPCSymbolDB.h"
 #include "Core/PowerPC/PowerPC.h"
-#include "DolphinQt/QtUtils/ActionHelper.h"
 #include "DolphinQt/Resources.h"
 #include "DolphinQt/Settings.h"
 
@@ -215,36 +214,36 @@ void CodeViewWidget::OnContextMenu()
   bool has_symbol = g_symbolDB.GetSymbolFromAddr(addr);
 
   auto* follow_branch_action =
-      AddAction(menu, tr("Follow &branch"), this, &CodeViewWidget::OnFollowBranch);
+      menu->addAction(tr("Follow &branch"), this, &CodeViewWidget::OnFollowBranch);
 
   menu->addSeparator();
 
-  AddAction(menu, tr("&Copy address"), this, &CodeViewWidget::OnCopyAddress);
+  menu->addAction(tr("&Copy address"), this, &CodeViewWidget::OnCopyAddress);
   auto* copy_address_action =
-      AddAction(menu, tr("Copy &function"), this, &CodeViewWidget::OnCopyFunction);
+      menu->addAction(tr("Copy &function"), this, &CodeViewWidget::OnCopyFunction);
   auto* copy_line_action =
-      AddAction(menu, tr("Copy code &line"), this, &CodeViewWidget::OnCopyCode);
-  auto* copy_hex_action = AddAction(menu, tr("Copy &hex"), this, &CodeViewWidget::OnCopyHex);
+      menu->addAction(tr("Copy code &line"), this, &CodeViewWidget::OnCopyCode);
+  auto* copy_hex_action = menu->addAction(tr("Copy &hex"), this, &CodeViewWidget::OnCopyHex);
   menu->addSeparator();
 
   auto* symbol_rename_action =
-      AddAction(menu, tr("&Rename symbol"), this, &CodeViewWidget::OnRenameSymbol);
+      menu->addAction(tr("&Rename symbol"), this, &CodeViewWidget::OnRenameSymbol);
   auto* symbol_size_action =
-      AddAction(menu, tr("Set symbol &size"), this, &CodeViewWidget::OnSetSymbolSize);
+      menu->addAction(tr("Set symbol &size"), this, &CodeViewWidget::OnSetSymbolSize);
   auto* symbol_end_action =
-      AddAction(menu, tr("Set symbol &end address"), this, &CodeViewWidget::OnSetSymbolEndAddress);
+      menu->addAction(tr("Set symbol &end address"), this, &CodeViewWidget::OnSetSymbolEndAddress);
   menu->addSeparator();
 
-  AddAction(menu, tr("Run &To Here"), this, &CodeViewWidget::OnRunToHere);
+  menu->addAction(tr("Run &To Here"), this, &CodeViewWidget::OnRunToHere);
   auto* function_action =
-      AddAction(menu, tr("&Add function"), this, &CodeViewWidget::OnAddFunction);
-  auto* ppc_action = AddAction(menu, tr("PPC vs Host"), this, &CodeViewWidget::OnPPCComparison);
-  auto* insert_blr_action = AddAction(menu, tr("&Insert blr"), this, &CodeViewWidget::OnInsertBLR);
-  auto* insert_nop_action = AddAction(menu, tr("Insert &nop"), this, &CodeViewWidget::OnInsertNOP);
+      menu->addAction(tr("&Add function"), this, &CodeViewWidget::OnAddFunction);
+  auto* ppc_action = menu->addAction(tr("PPC vs Host"), this, &CodeViewWidget::OnPPCComparison);
+  auto* insert_blr_action = menu->addAction(tr("&Insert blr"), this, &CodeViewWidget::OnInsertBLR);
+  auto* insert_nop_action = menu->addAction(tr("Insert &nop"), this, &CodeViewWidget::OnInsertNOP);
   auto* replace_action =
-      AddAction(menu, tr("Re&place instruction"), this, &CodeViewWidget::OnReplaceInstruction);
+      menu->addAction(tr("Re&place instruction"), this, &CodeViewWidget::OnReplaceInstruction);
   auto* restore_action =
-      AddAction(menu, tr("Restore instruction"), this, &CodeViewWidget::OnRestoreInstruction);
+      menu->addAction(tr("Restore instruction"), this, &CodeViewWidget::OnRestoreInstruction);
 
   follow_branch_action->setEnabled(running && GetBranchFromAddress(addr));