Integrating github/staging through commit 5f214be

Code/Tools/RC/ResourceCompiler/CMakeLists.txt

@@ -23,7 +23,6 @@ ly_add_target(
         Platform/${PAL_PLATFORM_NAME}/platform_${PAL_PLATFORM_NAME_LOWERCASE}.cmake
     INCLUDE_DIRECTORIES
         PUBLIC
-            PCH
             .
             ..
     BUILD_DEPENDENCIES

Code/Tools/RC/ResourceCompiler/ResourceCompiler.cpp

@@ -1284,10 +1284,6 @@ void ResourceCompiler::LogMultiLine(const char* szText)
 
         *pLine++ = *p++;
     }
-    while (*p)
-    {
-        ;
-    }
 }
 
 //////////////////////////////////////////////////////////////////////////

Code/Tools/RC/ResourceCompiler/ResourceCompiler.rc

@@ -73,7 +73,7 @@ BEGIN
             VALUE "FileVersion", "1.1.8.6"
             VALUE "InternalName", "ResourceCompiler"
             VALUE "LegalCopyright", "Portions of this file Copyright (c) Amazon.com, Inc. or its affiliates. All Rights Reserved. Original file Copyright (c) Crytek GMBH. Used under license by Amazon.com, Inc. and its affiliates."
-            VALUE "LegalTrademarks", "Lumberyard"
+            VALUE "LegalTrademarks", "Open 3D Engine"
             VALUE "OriginalFilename", "rc.exe"
             VALUE "ProductName", "Resource Compiler"
             VALUE "ProductVersion", "1.1.8.6"

Code/Tools/RC/ResourceCompiler/main.cpp

@@ -408,7 +408,7 @@ int rcmain(int argc, char** argv, [[maybe_unused]] char** envp)
         Config mainConfig;
         mainConfig.SetConfigKeyRegistry(&rc);
 
-        QSettings settings("HKEY_CURRENT_USER\\Software\\Amazon\\Lumberyard\\Settings", QSettings::NativeFormat);
+        QSettings settings("HKEY_CURRENT_USER\\Software\\Amazon\\O3DE\\Settings", QSettings::NativeFormat);
         bool enableSourceControl = settings.value("RC_EnableSourceControl", true).toBool();
         mainConfig.SetKeyValue(eCP_PriorityCmdline, "nosourcecontrol", enableSourceControl ? "0" : "1");