Merge remote-tracking branch 'upstream/stabilization/2110' into Prism/show-gem-repos-update

Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com> # Conflicts: # Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
2021-11-03 12:24:34 -07:00
parent 27c7e71516 803aac9169
commit 523f2e6465
119 changed files with 2211 additions and 736 deletions
@@ -63,9 +63,6 @@ namespace O3DE::ProjectManager
        QPushButton* m_secondaryButton = nullptr;
 #endif // TEMPLATE_GEM_CONFIGURATION_ENABLED

-        QString m_projectTemplatePath;
-        ProjectInfo m_projectInfo;
-        
        NewProjectSettingsScreen* m_newProjectSettingsScreen = nullptr;
        GemCatalogScreen* m_gemCatalogScreen = nullptr;
        GemRepoScreen* m_gemRepoScreen = nullptr;