[cmake] FEXConfig: automatically generate qrc

Rather than manually creating a Qt 5 and Qt 6 QRC, instead automatically
generate it. This makes it more flexible in the future in case any major
refactors are done (wink wink). Needs some quick tests on Qt 5

Signed-off-by: crueter <[email protected]>

Author: crueter

CMakeSettings.json

@@ -129,4 +129,4 @@
 			"variables": []
 		}
 	]
-}
+}

External/jemalloc

@@ -3,7 +3,10 @@ add_subdirectory(CommonTools)
 if (NOT MINGW_BUILD)
   if (BUILD_FEXCONFIG)
     find_package(Qt6 COMPONENTS Qml Quick Widgets QUIET)
-    if (NOT Qt6_FOUND)
+    if (Qt6_FOUND)
+      set(QT_VERSION_MAJOR 6)
+    else()
+      set(QT_VERSION_MAJOR 5)
       find_package(Qt5 COMPONENTS Qml Quick Widgets REQUIRED)
     endif()
 

Source/Tools/CMakeLists.txt

@@ -1,17 +1,34 @@
 set(CMAKE_AUTOMOC ON)
 
-add_executable(FEXConfig)
-target_sources(FEXConfig PRIVATE Main.cpp Main.h)
+add_executable(FEXConfig Main.cpp Main.h)
 target_include_directories(FEXConfig PRIVATE ${CMAKE_SOURCE_DIR}/Source/)
-target_link_libraries(FEXConfig PRIVATE Common JemallocDummy)
-if (Qt6_FOUND)
-  qt_add_resources(QT_RESOURCES qml6.qrc)
-  target_link_libraries(FEXConfig PRIVATE Qt6::Qml Qt6::Quick Qt6::Widgets)
-else()
-  qt_add_resources(QT_RESOURCES qml5.qrc)
-  target_link_libraries(FEXConfig PRIVATE Qt5::Qml Qt5::Quick Qt5::Widgets)
-endif()
-target_sources(FEXConfig PRIVATE ${QT_RESOURCES})
+
+set(common_qml
+  main.qml
+  icon.png)
+
+set(dialog_qml
+  qt${QT_VERSION_MAJOR}/FileDialog.qml
+  qt${QT_VERSION_MAJOR}/FolderDialog.qml
+  qt${QT_VERSION_MAJOR}/MessageDialog.qml)
+
+set(all_qml ${common_qml} ${dialog_qml})
+
+qt_add_resources(FEXConfig qml_common
+  PREFIX /qml/FEX/Config
+  BASE ${CMAKE_CURRENT_SOURCE_DIR}
+  FILES ${common_qml} icon.png)
+
+qt_add_resources(FEXConfig qml_dialog
+  PREFIX /qml/FEX/Config
+  BASE qt${QT_VERSION_MAJOR}
+  FILES ${dialog_qml})
+
+target_link_libraries(FEXConfig PRIVATE
+  Common JemallocDummy
+  Qt${QT_VERSION_MAJOR}::Qml
+  Qt${QT_VERSION_MAJOR}::Quick
+  Qt${QT_VERSION_MAJOR}::Widgets)
 
 if (CMAKE_BUILD_TYPE MATCHES "RELEASE")
   target_link_options(FEXConfig

Source/Tools/FEXConfig/CMakeLists.txt

@@ -401,7 +401,8 @@ ConfigRuntime::ConfigRuntime(const QString& ConfigFilename) {
   qmlRegisterSingletonInstance<ConfigModel>("FEX.ConfigModel", 1, 0, "ConfigModel", &ConfigModelInst);
   qmlRegisterSingletonInstance<HostLibsModel>("FEX.HostLibsModel", 1, 0, "HostLibsModel", &HostLibs);
   qmlRegisterSingletonInstance<RootFSModel>("FEX.RootFSModel", 1, 0, "RootFSModel", &RootFSList);
-  Engine.load(QUrl("qrc:/main.qml"));
+
+  Engine.load(QUrl(QStringLiteral("qrc:/qml/FEX/Config/main.qml")));
 
   Window = qobject_cast<QQuickWindow*>(Engine.rootObjects().first());
   if (!ConfigFilename.isEmpty()) {

Source/Tools/FEXConfig/Main.cpp

@@ -9,7 +9,7 @@ import FEX.RootFSModel 1.0
 
 // Qt 6 changed the API of the Dialogs module slightly.
 // The differences are abstracted away in this import:
-import "qrc:/dialogs"
+import "qrc:/qml"
 
 ApplicationWindow {
     id: root