cuse add ressources instead of the whole qml thingy

OlivierLDff · Aug 20, 2024 · 33d41f6 · 33d41f6
1 parent 13de803
commit 33d41f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/qml/Qaterial/Fonts/CMakeLists.txt b/qml/Qaterial/Fonts/CMakeLists.txt
@@ -69,14 +69,11 @@ if(QATERIAL_ENABLE_LATO)
   )
 endif()
 
-message(STATUS "Generate QaterialFonts.qrc")
-
 file(GLOB_RECURSE QATERIAL_FONTS_FILES
   LIST_DIRECTORIES false
   "${QATERIAL_FONT_DIRECTORY}/*.ttf"
 )
 
-
 foreach(QATERIAL_FONT_FILE ${QATERIAL_FONTS_FILES})
   get_filename_component(QATERIAL_FONT_FILE_NAME ${QATERIAL_FONT_FILE} NAME)
   set_source_files_properties(${QATERIAL_FONT_FILE} PROPERTIES
@@ -85,13 +82,9 @@ foreach(QATERIAL_FONT_FILE ${QATERIAL_FONTS_FILES})
 endforeach()
 
 qt_add_library(${QATERIAL_TARGET}Fonts STATIC ${QATERIAL_FONTS_QML_QRC})
-qt_add_qml_module(${QATERIAL_TARGET}Fonts
-  URI "Qaterial.Fonts"
-  RESOURCE_PREFIX "/"
-  RESOURCES
-    ${QATERIAL_FONTS_FILES}
+qt_add_resources(${QATERIAL_TARGET}Fonts ${QATERIAL_FONTS_FILES}
+  RESOURCE_PREFIX "/Qaterial/Fonts"
   OUTPUT_TARGETS QATERIAL_FONTS_QML_TARGETS
-  NO_PLUGIN
 )
 add_library(${QATERIAL_TARGET}::Fonts ALIAS ${QATERIAL_TARGET}Fonts)
 set_target_properties(${QATERIAL_TARGET}Fonts PROPERTIES AUTORCC TRUE)

diff --git a/qml/Qaterial/Icons/CMakeLists.txt b/qml/Qaterial/Icons/CMakeLists.txt
@@ -44,13 +44,9 @@ endif()
 qt_add_library(${QATERIAL_TARGET}Icons STATIC)
 
 if(QATERIAL_ENABLE_ICONS)
-  qt_add_qml_module(${QATERIAL_TARGET}Icons
-    URI "Qaterial.Icons"
-    RESOURCE_PREFIX "/"
-    RESOURCES
-      ${QATERIAL_ICONS_FILES}
+  qt_add_ressources(${QATERIAL_TARGET}Icons ${QATERIAL_ICONS_FILES}
+    RESOURCE_PREFIX "/Qaterial/Icons"
     OUTPUT_TARGETS QATERIAL_ICONS_QML_TARGETS
-    NO_PLUGIN
   )
 endif()