From bec24a85bf4ca837fb7af22182856eae6409b3bd Mon Sep 17 00:00:00 2001
From: AMZN-Phil <pconroy@amazon.com>
Date: Mon, 25 Oct 2021 15:59:30 -0700
Subject: [PATCH 1/3] Fix old references to gem_list

Signed-off-by: AMZN-Phil <pconroy@amazon.com>
---
 scripts/o3de/o3de/repo.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/o3de/o3de/repo.py b/scripts/o3de/o3de/repo.py
index 9c26658a30..32c2cba428 100644
--- a/scripts/o3de/o3de/repo.py
+++ b/scripts/o3de/o3de/repo.py
@@ -115,14 +115,14 @@ def get_gem_json_paths_from_cached_repo(repo_uri: str) -> set:
     file_name = pathlib.Path(cache_filename).resolve()
     if not file_name.is_file():
         logger.error(f'Could not find cached repo json file for {repo_uri}')
-        return gem_list
+        return gem_set
 
     with file_name.open('r') as f:
         try:
             repo_data = json.load(f)
         except json.JSONDecodeError as e:
             logger.error(f'{file_name} failed to load: {str(e)}')
-            return gem_list
+            return gem_set
 
         # Get list of gems, then add all json paths to the list if they exist in the cache
         repo_gems = []

From 423693d16b13a6589f8cda4ec0127ce83226cefc Mon Sep 17 00:00:00 2001
From: AMZN-Phil <pconroy@amazon.com>
Date: Mon, 25 Oct 2021 16:05:19 -0700
Subject: [PATCH 2/3] Re-add call used to initiate gem download

Signed-off-by: AMZN-Phil <pconroy@amazon.com>
---
 .../ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
index bc667db4b4..b3d0ab83ed 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
@@ -166,6 +166,10 @@ namespace O3DE::ProjectManager
                 {
                     notification += " " + tr("and") + " ";
                 }
+                if (added && GemModel::GetDownloadStatus(modelIndex) == GemInfo::DownloadStatus::NotDownloaded)
+                {
+                    m_downloadController->AddGemDownload(GemModel::GetName(modelIndex));
+                }
             }
 
             if (numChangedDependencies == 1 )

From f3499011ac52f801ab5bf5f27791f56039e0a7d1 Mon Sep 17 00:00:00 2001
From: Chris Burel <burelc@amazon.com>
Date: Tue, 26 Oct 2021 08:30:51 -0700
Subject: [PATCH 3/3] [Mac] Fix QtEditorApplication_mac include (#4978)

Commit 8e03d6f3065105f53a171345a2cf4a661cec4eb0 missed updating the
platform-specific mac QApplication implementation file to include the
class declaration from the new header.

Signed-off-by: Chris Burel <burelc@amazon.com>
---
 Code/Editor/Platform/Mac/Editor/Core/QtEditorApplication_mac.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Code/Editor/Platform/Mac/Editor/Core/QtEditorApplication_mac.mm b/Code/Editor/Platform/Mac/Editor/Core/QtEditorApplication_mac.mm
index a7f59b7ac8..c664d13c79 100644
--- a/Code/Editor/Platform/Mac/Editor/Core/QtEditorApplication_mac.mm
+++ b/Code/Editor/Platform/Mac/Editor/Core/QtEditorApplication_mac.mm
@@ -9,7 +9,7 @@
 #import <AppKit/NSEvent.h>
 
 #include "EditorDefs.h"
-#include "QtEditorApplication.h"
+#include "QtEditorApplication_mac.h"
 
 // AzFramework
 #include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>