Преглед на файлове

Fix Project Manager Qt Ui files not Being Autogenerated (#588)

* Moved Qt files into to renamed 'S'ource

* Updated files after moving all Qt folder into Source

* Updated Source capitalization in cmake files list

* Adding newline to the end of project_manager_files.cmake

Co-authored-by: lumberyard-employee-dm <[email protected]>
AMZN-nggieber преди 4 години
родител
ревизия
724add6365
променени са 28 файла, в които са добавени 57 реда и са изтрити 57 реда
  1. 1 1
      Code/Tools/ProjectManager/CMakeLists.txt
  2. 2 2
      Code/Tools/ProjectManager/Source/EngineSettings.cpp
  3. 1 1
      Code/Tools/ProjectManager/Source/EngineSettings.h
  4. 0 0
      Code/Tools/ProjectManager/Source/EngineSettings.ui
  5. 2 2
      Code/Tools/ProjectManager/Source/FirstTimeUse.cpp
  6. 1 1
      Code/Tools/ProjectManager/Source/FirstTimeUse.h
  7. 0 0
      Code/Tools/ProjectManager/Source/FirstTimeUse.ui
  8. 2 2
      Code/Tools/ProjectManager/Source/GemCatalog.cpp
  9. 1 1
      Code/Tools/ProjectManager/Source/GemCatalog.h
  10. 0 0
      Code/Tools/ProjectManager/Source/GemCatalog.ui
  11. 2 2
      Code/Tools/ProjectManager/Source/NewProjectSettings.cpp
  12. 1 1
      Code/Tools/ProjectManager/Source/NewProjectSettings.h
  13. 0 0
      Code/Tools/ProjectManager/Source/NewProjectSettings.ui
  14. 2 2
      Code/Tools/ProjectManager/Source/ProjectManagerWindow.cpp
  15. 0 0
      Code/Tools/ProjectManager/Source/ProjectManagerWindow.h
  16. 0 0
      Code/Tools/ProjectManager/Source/ProjectManagerWindow.ui
  17. 2 2
      Code/Tools/ProjectManager/Source/ProjectSettings.cpp
  18. 1 1
      Code/Tools/ProjectManager/Source/ProjectSettings.h
  19. 0 0
      Code/Tools/ProjectManager/Source/ProjectSettings.ui
  20. 2 2
      Code/Tools/ProjectManager/Source/ProjectsHome.cpp
  21. 1 1
      Code/Tools/ProjectManager/Source/ProjectsHome.h
  22. 0 0
      Code/Tools/ProjectManager/Source/ProjectsHome.ui
  23. 0 0
      Code/Tools/ProjectManager/Source/ScreenDefs.h
  24. 6 6
      Code/Tools/ProjectManager/Source/ScreenFactory.cpp
  25. 1 1
      Code/Tools/ProjectManager/Source/ScreenFactory.h
  26. 1 1
      Code/Tools/ProjectManager/Source/ScreenWidget.h
  27. 1 1
      Code/Tools/ProjectManager/Source/main.cpp
  28. 27 27
      Code/Tools/ProjectManager/project_manager_files.cmake

+ 1 - 1
Code/Tools/ProjectManager/CMakeLists.txt

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

+ 2 - 2
Code/Tools/ProjectManager/source/Qt/EngineSettings.cpp → 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
 {

+ 1 - 1
Code/Tools/ProjectManager/source/Qt/EngineSettings.h → 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

+ 0 - 0
Code/Tools/ProjectManager/source/Qt/EngineSettings.ui → Code/Tools/ProjectManager/Source/EngineSettings.ui


+ 2 - 2
Code/Tools/ProjectManager/source/Qt/FirstTimeUse.cpp → 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
 {

+ 1 - 1
Code/Tools/ProjectManager/source/Qt/FirstTimeUse.h → 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

+ 0 - 0
Code/Tools/ProjectManager/source/Qt/FirstTimeUse.ui → Code/Tools/ProjectManager/Source/FirstTimeUse.ui


+ 2 - 2
Code/Tools/ProjectManager/source/Qt/GemCatalog.cpp → 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
 {

+ 1 - 1
Code/Tools/ProjectManager/source/Qt/GemCatalog.h → 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

+ 0 - 0
Code/Tools/ProjectManager/source/Qt/GemCatalog.ui → Code/Tools/ProjectManager/Source/GemCatalog.ui


+ 2 - 2
Code/Tools/ProjectManager/source/Qt/NewProjectSettings.cpp → 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
 {

+ 1 - 1
Code/Tools/ProjectManager/source/Qt/NewProjectSettings.h → 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

+ 0 - 0
Code/Tools/ProjectManager/source/Qt/NewProjectSettings.ui → Code/Tools/ProjectManager/Source/NewProjectSettings.ui


+ 2 - 2
Code/Tools/ProjectManager/source/Qt/ProjectManagerWindow.cpp → 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
 {

+ 0 - 0
Code/Tools/ProjectManager/source/Qt/ProjectManagerWindow.h → Code/Tools/ProjectManager/Source/ProjectManagerWindow.h


+ 0 - 0
Code/Tools/ProjectManager/source/Qt/ProjectManagerWindow.ui → Code/Tools/ProjectManager/Source/ProjectManagerWindow.ui


+ 2 - 2
Code/Tools/ProjectManager/source/Qt/ProjectSettings.cpp → 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
 {

+ 1 - 1
Code/Tools/ProjectManager/source/Qt/ProjectSettings.h → 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

+ 0 - 0
Code/Tools/ProjectManager/source/Qt/ProjectSettings.ui → Code/Tools/ProjectManager/Source/ProjectSettings.ui


+ 2 - 2
Code/Tools/ProjectManager/source/Qt/ProjectsHome.cpp → 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
 {

+ 1 - 1
Code/Tools/ProjectManager/source/Qt/ProjectsHome.h → 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

+ 0 - 0
Code/Tools/ProjectManager/source/Qt/ProjectsHome.ui → Code/Tools/ProjectManager/Source/ProjectsHome.ui


+ 0 - 0
Code/Tools/ProjectManager/source/ScreenDefs.h → Code/Tools/ProjectManager/Source/ScreenDefs.h


+ 6 - 6
Code/Tools/ProjectManager/source/ScreenFactory.cpp → 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
 {

+ 1 - 1
Code/Tools/ProjectManager/source/ScreenFactory.h → Code/Tools/ProjectManager/Source/ScreenFactory.h

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

+ 1 - 1
Code/Tools/ProjectManager/source/Qt/ScreenWidget.h → 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

+ 1 - 1
Code/Tools/ProjectManager/source/main.cpp → 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>

+ 27 - 27
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
+)