Integrating up through commit 90f050496

This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -20,6 +20,7 @@
#include <AzToolsFramework/API/ToolsApplicationAPI.h>
#include <AzToolsFramework/Application/ToolsApplication.h>
#include <AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.hxx>
#include <AzToolsFramework/UnitTest/ToolsTestApplication.h>
#include <AzToolsFramework/Viewport/ActionBus.h>
#include <QtTest/QtTest>
@@ -99,7 +100,7 @@ namespace UnitTest
private:
ToolsApplication m_app;
ToolsTestApplication m_app{ "EntityIdQLabelTest" };
};