Cherry Picking (lyn1751) (#1854)
* Cherry Picking (lyn1751) Problem with DCO so we need to cherry pick this branch. Signed-off-by: aaguilea <aaguilea@amazon.com> * Cherry picking #2 Signed-off-by: aaguilea <aaguilea@amazon.com> * Cherry picking 3 Signed-off-by: aaguilea <aaguilea@amazon.com> * Changed variables reverseurls This was just changing some name variables. Signed-off-by: aaguilea <aaguilea@amazon.com> * Changes from past PR Signed-off-by: aaguilea <aaguilea@amazon.com> * changes from past PR and fixed small bug: Also removed some legacy code from Resources.h Signed-off-by: aaguilea <aaguilea@amazon.com> * couple of changes from actual PR Signed-off-by: aaguilea <aaguilea@amazon.com> * fixed copyright issues for AR Signed-off-by: aaguilea <aaguilea@amazon.com>
This commit is contained in:
committed by
GitHub
parent
a3d14e217e
commit
4f523e496f
+12
@@ -104,6 +104,18 @@ namespace UnitTest
|
||||
}
|
||||
}
|
||||
|
||||
void TestEditorActions::AddActionViaBusCrc(AZ::Crc32 id, QAction* action)
|
||||
{
|
||||
AZ_Assert(action, "Attempting to add a null action");
|
||||
|
||||
if (action)
|
||||
{
|
||||
action->setData(aznumeric_cast<AZ::u32>(id));
|
||||
action->setShortcutContext(Qt::ApplicationShortcut);
|
||||
m_defaultWidget.addAction(action);
|
||||
}
|
||||
}
|
||||
|
||||
void TestEditorActions::RemoveActionViaBus(QAction* action)
|
||||
{
|
||||
AZ_Assert(action, "Attempting to remove a null action");
|
||||
|
||||
+1
@@ -86,6 +86,7 @@ namespace UnitTest
|
||||
{
|
||||
// EditorActionRequestBus ...
|
||||
void AddActionViaBus(int id, QAction* action) override;
|
||||
void AddActionViaBusCrc(AZ::Crc32 id, QAction* action) override;
|
||||
void RemoveActionViaBus(QAction* action) override;
|
||||
void EnableDefaultActions() override;
|
||||
void DisableDefaultActions() override;
|
||||
|
||||
Reference in New Issue
Block a user