Integrating latest from github/staging

Integrating up through commit 5e1bdae
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
@@ -61,7 +61,6 @@ public:
    MOCK_METHOD0(GetLevelDataFolder, QString());
    MOCK_METHOD1(GetPrimaryCDFolder, QString(EEditorPathName));
    MOCK_METHOD0(GetResolvedUserFolder, QString());
-    MOCK_METHOD0(GetProjectName, QString());
    MOCK_METHOD4(ExecuteConsoleApp, bool(const QString&,QString&,bool,bool));
    MOCK_METHOD0(SetDataModified, void());
    MOCK_CONST_METHOD0(IsInitialized, bool());