Merge branch 'development' into cmake/SPEC-2513_w4244

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp

Code/Tools/ProjectManager/Source/FormBrowseEditWidget.cpp

@@ -10,6 +10,7 @@
 
 #include <QPushButton>
 #include <QHBoxLayout>
+#include <QKeyEvent>
 
 namespace O3DE::ProjectManager
 {
@@ -27,4 +28,14 @@ namespace O3DE::ProjectManager
         : FormBrowseEditWidget(labelText, "", parent)
     {
     }
+
+    void FormBrowseEditWidget::keyPressEvent(QKeyEvent* event)
+    {
+        int key = event->key();
+        if (key == Qt::Key_Return || key == Qt::Key_Enter)
+        {
+            HandleBrowseButton();
+        }
+    }
+
 } // namespace O3DE::ProjectManager

Code/Tools/ProjectManager/Source/FormBrowseEditWidget.h

@@ -24,6 +24,9 @@ namespace O3DE::ProjectManager
         explicit FormBrowseEditWidget(const QString& labelText = "", QWidget* parent = nullptr);
         ~FormBrowseEditWidget() = default;
 
+    protected:
+        void keyPressEvent(QKeyEvent* event) override;
+
     protected slots:
         virtual void HandleBrowseButton() = 0;
     };

Code/Tools/ProjectManager/Source/FormFolderBrowseEditWidget.cpp

@@ -34,7 +34,6 @@ namespace O3DE::ProjectManager
         {
             setText(directory);
         }
-
     }
 
     void FormFolderBrowseEditWidget::setText(const QString& text)
@@ -42,4 +41,5 @@ namespace O3DE::ProjectManager
         QString path = QDir::toNativeSeparators(text);
         FormBrowseEditWidget::setText(path);
     }
+
 } // namespace O3DE::ProjectManager

Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidget.cpp

@@ -40,7 +40,7 @@ namespace AZ
 
             void ManifestWidget::BuildFromScene(const AZStd::shared_ptr<Containers::Scene>& scene)
             {
-                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+                AZ_PROFILE_FUNCTION(Editor);
                 ui->m_tabs->clear();
                 m_pages.clear();
                 
@@ -80,7 +80,7 @@ namespace AZ
 
             bool ManifestWidget::AddObject(const AZStd::shared_ptr<DataTypes::IManifestObject>& object)
             {
-                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+                AZ_PROFILE_FUNCTION(Editor);
                 for (ManifestWidgetPage* page : m_pages)
                 {
                     if (page->SupportsType(object))

Code/Tools/SceneAPI/SceneUI/SceneWidgets/ManifestWidgetPage.cpp

@@ -76,7 +76,7 @@ namespace AZ
 
             bool ManifestWidgetPage::AddObject(const AZStd::shared_ptr<DataTypes::IManifestObject>& object)
             {
-                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+                AZ_PROFILE_FUNCTION(Editor);
                 if (!SupportsType(object))
                 {
                     return false;
@@ -218,7 +218,7 @@ namespace AZ
 
             void ManifestWidgetPage::RefreshPage()
             {
-                AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::Editor);
+                AZ_PROFILE_FUNCTION(Editor);
                 m_propertyEditor->InvalidateAll();
                 m_propertyEditor->ExpandAll();
             }

Code/Tools/Standalone/Source/Driller/AreaChart.cpp

@@ -231,14 +231,14 @@ namespace AreaChart
     
     void AreaChart::AddPoint(size_t seriesId, int position, unsigned int value)
     {
-        AZ_PROFILE_TIMER("Standalone Tools", __FUNCTION__);
+        AZ_PROFILE_FUNCTION(AzToolsFramework);
         LinePoint linePoint(position,value);
         AddPoint(seriesId,linePoint);
     }
     
     void AreaChart::AddPoint(size_t seriesId, const LinePoint& linePoint)
     {
-        AZ_PROFILE_TIMER("Standalone Tools", __FUNCTION__);
+        AZ_PROFILE_FUNCTION(AzToolsFramework);
         if (!IsValidSeriesId(seriesId))
         {
             AZ_Error("AreaChart", false, "Invalid SeriesId given.");
@@ -419,7 +419,7 @@ namespace AreaChart
     
     void AreaChart::paintEvent(QPaintEvent* event)
     {
-        AZ_PROFILE_TIMER("Standalone Tools", __FUNCTION__);
+        AZ_PROFILE_FUNCTION(AzToolsFramework);
         (void)event;
         
         if (m_sizingDirty)
@@ -435,7 +435,7 @@ namespace AreaChart
 
         if (m_regenGraph)
         {
-            AZ_PROFILE_TIMER("Standalone Tools", "Generating Graph Data");
+            AZ_PROFILE_FUNCTION(AzToolsFramework);
             m_regenGraph = false;
 
             if (m_verticalAxis)

Code/Tools/Standalone/Source/Driller/Replica/BaseDetailView.h

@@ -203,7 +203,7 @@ namespace Driller
 
         void RedrawGraph()
         {
-            AZ_PROFILE_TIMER("Standalone Tools", __FUNCTION__);
+            AZ_PROFILE_FUNCTION(AzToolsFramework);
             switch (m_displayMode)
             {
             case DisplayMode::Active:
@@ -518,7 +518,7 @@ namespace Driller
 
         void RefreshView(FrameNumberType frameId)
         {
-            AZ_PROFILE_TIMER("Standalone Tools", __FUNCTION__);
+            AZ_PROFILE_FUNCTION(AzToolsFramework);
             AZStd::unordered_set< Key > discoveredSet;
 
             m_tableViewOrdering.clear();

Code/Tools/Standalone/Source/Driller/Replica/ReplicaDataView.cpp

@@ -1628,7 +1628,7 @@ namespace Driller
 
     void ReplicaDataView::ParseFrameData(FrameNumberType frameId)
     {
-        AZ_PROFILE_TIMER("Standalone Tools", __FUNCTION__);
+        AZ_PROFILE_FUNCTION(AzToolsFramework);
         if (frameId < 0 || frameId >= m_aggregator->GetFrameCount() || m_parsedFrames.find(frameId) != m_parsedFrames.end())
         {
             return;