Merge remote-tracking branch 'origin/nggieber-ProjectManagerFixUngeneratedQtUi' into ly-as-sdk/LYN-2948

Code/Tools/ProjectManager/CMakeLists.txt

@@ -27,7 +27,7 @@ ly_add_target(
         PUBLIC
             .
         PRIVATE
-            source
+            Source
 
     BUILD_DEPENDENCIES
         PRIVATE

Code/Tools/ProjectManager/Source/EngineSettings.cpp

@@ -10,9 +10,9 @@
  *
  */
 
-#include <Qt/EngineSettings.h>
+#include <EngineSettings.h>
 
-#include <Qt/ui_EngineSettings.h>
+#include <Source/ui_EngineSettings.h>
 
 namespace O3DE::ProjectManager
 {

Code/Tools/ProjectManager/Source/EngineSettings.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <Qt/ScreenWidget.h>
+#include <ScreenWidget.h>
 #endif
 
 namespace Ui

Code/Tools/ProjectManager/Source/FirstTimeUse.cpp

@@ -10,9 +10,9 @@
  *
  */
 
-#include <Qt/FirstTimeUse.h>
+#include <FirstTimeUse.h>
 
-#include <Qt/ui_FirstTimeUse.h>
+#include <Source/ui_FirstTimeUse.h>
 
 namespace O3DE::ProjectManager
 {

Code/Tools/ProjectManager/Source/FirstTimeUse.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <Qt/ScreenWidget.h>
+#include <ScreenWidget.h>
 #endif
 
 namespace Ui

Code/Tools/ProjectManager/Source/GemCatalog.cpp

@@ -10,9 +10,9 @@
  *
  */
 
-#include <Qt/GemCatalog.h>
+#include <GemCatalog.h>
 
-#include <Qt/ui_GemCatalog.h>
+#include <Source/ui_GemCatalog.h>
 
 namespace O3DE::ProjectManager
 {

Code/Tools/ProjectManager/Source/GemCatalog.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <Qt/ScreenWidget.h>
+#include <ScreenWidget.h>
 #endif
 
 namespace Ui

Code/Tools/ProjectManager/Source/NewProjectSettings.cpp

@@ -10,9 +10,9 @@
  *
  */
 
-#include <Qt/NewProjectSettings.h>
+#include <NewProjectSettings.h>
 
-#include <Qt/ui_NewProjectSettings.h>
+#include <Source/ui_NewProjectSettings.h>
 
 namespace O3DE::ProjectManager
 {

Code/Tools/ProjectManager/Source/NewProjectSettings.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <Qt/ScreenWidget.h>
+#include <ScreenWidget.h>
 #endif
 
 namespace Ui

Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp

@@ -10,7 +10,7 @@
  *
  */
 
-#include <Qt/ProjectManagerWindow.h>
+#include <ProjectManagerWindow.h>
 #include <ScreenFactory.h>
 
 #include <AzQtComponents/Components/StyleManager.h>
@@ -18,7 +18,7 @@
 
 #include <QDir>
 
-#include <Qt/ui_ProjectManagerWindow.h>
+#include <Source/ui_ProjectManagerWindow.h>
 
 namespace O3DE::ProjectManager
 {

Code/Tools/ProjectManager/Source/ProjectSettings.cpp

@@ -10,9 +10,9 @@
  *
  */
 
-#include <Qt/ProjectSettings.h>
+#include <ProjectSettings.h>
 
-#include <Qt/ui_ProjectSettings.h>
+#include <Source/ui_ProjectSettings.h>
 
 namespace O3DE::ProjectManager
 {

Code/Tools/ProjectManager/Source/ProjectSettings.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <Qt/ScreenWidget.h>
+#include <ScreenWidget.h>
 #endif
 
 namespace Ui

Code/Tools/ProjectManager/Source/ProjectsHome.cpp

@@ -10,9 +10,9 @@
  *
  */
 
-#include <Qt/ProjectsHome.h>
+#include <ProjectsHome.h>
 
-#include <Qt/ui_ProjectsHome.h>
+#include <Source/ui_ProjectsHome.h>
 
 namespace O3DE::ProjectManager
 {

Code/Tools/ProjectManager/Source/ProjectsHome.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <Qt/ScreenWidget.h>
+#include <ScreenWidget.h>
 #endif
 
 namespace Ui

Code/Tools/ProjectManager/Source/ScreenFactory.cpp

@@ -11,12 +11,12 @@
  */
 #include <ScreenFactory.h>
 
-#include <Qt/FirstTimeUse.h>
-#include <Qt/NewProjectSettings.h>
-#include <Qt/GemCatalog.h>
-#include <Qt/ProjectsHome.h>
-#include <Qt/ProjectSettings.h>
-#include <Qt/EngineSettings.h>
+#include <FirstTimeUse.h>
+#include <NewProjectSettings.h>
+#include <GemCatalog.h>
+#include <ProjectsHome.h>
+#include <ProjectSettings.h>
+#include <EngineSettings.h>
 
 namespace O3DE::ProjectManager
 {

Code/Tools/ProjectManager/Source/ScreenFactory.h

@@ -13,7 +13,7 @@
 
 #include <ScreenDefs.h>
 
-#include <Qt/ProjectManagerWindow.h>
+#include <ProjectManagerWindow.h>
 
 #include <QWidget>
 

Code/Tools/ProjectManager/Source/ScreenWidget.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
-#include <Qt/ProjectManagerWindow.h>
+#include <ProjectManagerWindow.h>
 
 #include <QWidget>
 #endif

Code/Tools/ProjectManager/Source/main.cpp

@@ -16,7 +16,7 @@
 #include <AzCore/Settings/SettingsRegistryMergeUtils.h>
 #include <AzCore/IO/Path/Path.h>
 
-#include <Qt/ProjectManagerWindow.h>
+#include <ProjectManagerWindow.h>
 
 #include <QApplication>
 #include <QCoreApplication>

Code/Tools/ProjectManager/project_manager_files.cmake

@@ -11,30 +11,30 @@
 
 set(FILES
     project_manager.qrc
-    source/main.cpp
-    source/ScreenDefs.h
-    source/ScreenFactory.h
-    source/ScreenFactory.cpp
-    source/Qt/ScreenWidget.h
-    source/Qt/FirstTimeUse.h
-    source/Qt/FirstTimeUse.cpp
-    source/Qt/FirstTimeUse.ui
-    source/Qt/ProjectManagerWindow.h
-    source/Qt/ProjectManagerWindow.cpp
-    source/Qt/ProjectManagerWindow.ui
-    source/Qt/NewProjectSettings.h
-    source/Qt/NewProjectSettings.cpp
-    source/Qt/NewProjectSettings.ui
-    source/Qt/GemCatalog.h
-    source/Qt/GemCatalog.cpp
-    source/Qt/GemCatalog.ui
-    source/Qt/ProjectsHome.h
-    source/Qt/ProjectsHome.cpp
-    source/Qt/ProjectsHome.ui
-    source/Qt/ProjectSettings.h
-    source/Qt/ProjectSettings.cpp
-    source/Qt/ProjectSettings.ui
-    source/Qt/EngineSettings.h
-    source/Qt/EngineSettings.cpp
-    source/Qt/EngineSettings.ui
-)
+    Source/main.cpp
+    Source/ScreenDefs.h
+    Source/ScreenFactory.h
+    Source/ScreenFactory.cpp
+    Source/ScreenWidget.h
+    Source/FirstTimeUse.h
+    Source/FirstTimeUse.cpp
+    Source/FirstTimeUse.ui
+    Source/ProjectManagerWindow.h
+    Source/ProjectManagerWindow.cpp
+    Source/ProjectManagerWindow.ui
+    Source/NewProjectSettings.h
+    Source/NewProjectSettings.cpp
+    Source/NewProjectSettings.ui
+    Source/GemCatalog.h
+    Source/GemCatalog.cpp
+    Source/GemCatalog.ui
+    Source/ProjectsHome.h
+    Source/ProjectsHome.cpp
+    Source/ProjectsHome.ui
+    Source/ProjectSettings.h
+    Source/ProjectSettings.cpp
+    Source/ProjectSettings.ui
+    Source/EngineSettings.h
+    Source/EngineSettings.cpp
+    Source/EngineSettings.ui
+)