Merging upstream

Signed-off-by: Dayo Lawal <lawalfua@amazon.com>

Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp

@@ -11,7 +11,6 @@
 
 #include <Atom/Document/MaterialDocumentModule.h>
 #include <Atom/Document/MaterialDocumentSystemRequestBus.h>
-
 #include <Atom/Viewport/MaterialViewportModule.h>
 
 #include <Atom/Window/MaterialEditorWindowModule.h>
@@ -43,8 +42,8 @@
 #include <MaterialEditor_Traits_Platform.h>
 
 AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT
-#include <QObject>
 #include <QMessageBox>
+#include <QObject>
 AZ_POP_DISABLE_WARNING
 
 namespace MaterialEditor
@@ -52,7 +51,7 @@ namespace MaterialEditor
     //! This function returns the build system target name of "MaterialEditor
     AZStd::string MaterialEditorApplication::GetBuildTargetName() const
     {
-#if !defined (LY_CMAKE_TARGET)
+#if !defined(LY_CMAKE_TARGET)
 #error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target"
 #endif
         return AZStd::string{ LY_CMAKE_TARGET };
@@ -71,7 +70,6 @@ namespace MaterialEditor
 
     MaterialEditorApplication::MaterialEditorApplication(int* argc, char*** argv)
         : AtomToolsApplication(argc, argv)
-
     {
         QApplication::setApplicationName("O3DE Material Editor");