[DoNotMerge] ✨Use declarative macros for better Qt integration (e.g. QDS) #172

Thiesius · 2025-04-19T19:56:42Z

This is mainly for CLion. As the IDE generates in source build folder like this.

Thiesius · 2025-04-19T19:57:23Z

This is useful so you can install both release and debug library in the install folder.

OlivierLDff · 2025-04-20T09:22:50Z

This is neat since Qt6.8, thank you for the discovery I missed it. I guess it won't change much in here, but I have some projects that may be affected so I can remove lots of CMake code.

Thiesius · 2025-04-19T19:59:33Z

I had a lot of troubles with these prefixes and what not. I haven't tried to go back to individual subtargets linking into this library.

Thiesius · 2025-04-19T19:59:57Z

OUTPUT_DIRECTORY contains everything one might need to install into output "qml" dir. Haven't found some dedicated target for that or example for "how it is done in Qt".

Thiesius · 2025-04-19T20:03:22Z

The next section is needed, because the generated files always include the "parent header" with not prefix. Looks a bit hacky though. There could be better solution.

This is related:
https://forum.qt.io/topic/158392/problem-with-qml_element-for-classes-in-subfolder-of-project

Thiesius · 2025-04-19T20:03:52Z

Installs all that is needed for QDS into QML dir.

Thiesius · 2025-04-19T20:04:20Z

Bug I think, This can also be probably split and merged immediately.

Thiesius · 2025-04-19T20:06:19Z

I had to remove this line because my AlertDialogs had a cut headers.

E.g. "Failed to blah glah flah" would become "Failed to blah gla..."

Not sure if this is a correct place to treat this, but it works 😄

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,3 +15,5 @@ CMakeLists.txt.user @@
     # nix files
     result*
     .direnv
+    cmake-build-*/

-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,9 @@ endif() @@
     set(QATERIAL_ENABLE_INSTALL ${_default_QATERIAL_ENABLE_INSTALL} CACHE BOOL "Generate the install target")
+    # "d" postfix should also transitively apply to dependencies but won't affect the parent scope
+    set(CMAKE_DEBUG_POSTFIX "d")
     project(${QATERIAL_PROJECT} VERSION ${QATERIAL_VERSION} LANGUAGES CXX)
     if(QATERIAL_MAIN_PROJECT)
       set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ Expand Down Expand Up / @@ -119,19 +122,6 @@ endif() @@
     include(cmake/FetchQOlm.cmake)
-    # ───── RESSOURCES ─────
-    add_subdirectory(qml)
-    include(cmake/QaterialGenerateIcons.cmake)
-    set(QATERIAL_ICONS_OUTPUT_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/Qaterial_icons")
-    set(QATERIAL_ICONS_CLASS_FILE "${QATERIAL_ICONS_OUTPUT_FOLDER}/Qaterial/Display/Icons.hpp")
-    set(QATERIAL_ICONS_SRC_FILE "${QATERIAL_ICONS_OUTPUT_FOLDER}/Qaterial/Display/Icons.cpp")
-    qaterial_generate_icons_class(${QATERIAL_ICONS_CLASS_FILE} ${QATERIAL_ICONS_SRC_FILE})
-    set(QATERIAL_GEN_SRCS
-      ${QATERIAL_ICONS_CLASS_FILE}
-      ${QATERIAL_ICONS_SRC_FILE}
-    )
     # ───── QML SOURCES ─────
     set(QATERIAL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/Qaterial)
@@ Expand Down Expand Up / @@ -182,12 +172,28 @@ set(QATERIAL_SRCS @@
     source_group(TREE "${QATERIAL_SOURCE_DIR}" FILES ${QATERIAL_SRCS})
     source_group(TREE "${QATERIAL_ICONS_OUTPUT_FOLDER}/Qaterial" FILES ${QATERIAL_GEN_SRCS})
-    set(QATERIAL_SRCS ${QATERIAL_SRCS} ${QATERIAL_GEN_SRCS})
+    set(QATERIAL_SRCS ${QATERIAL_SRCS})
     # ───── QATERIAL TARGET ─────
+    qt_policy(SET QTP0004 NEW)
+    set(QATERIAL_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/gen_out/${QATERIAL_TARGET}")
     if(${QATERIAL_BUILD_SHARED})
-      qt_add_library(${QATERIAL_TARGET} SHARED ${QATERIAL_SRCS})
+      qt_add_qml_module(Qaterial SHARED
+        URI "Qaterial"
+        VERSION ${QATERIAL_VERSION}
+        DEPENDENCIES
+          QtQuick/auto
+        CLASS_NAME QaterialPlugin
+        PLUGIN_TARGET qaterialplugin
+        NO_PLUGIN_OPTIONAL
+        RESOURCE_PREFIX "/"
+        SOURCES ${QATERIAL_SRCS}
+        OUTPUT_DIRECTORY "${QATERIAL_OUTPUT_DIR}"
+      )
       target_compile_definitions(${QATERIAL_TARGET} PRIVATE -DQATERIAL_SHARED)
     else()
       qt_add_library(${QATERIAL_TARGET} STATIC ${QATERIAL_SRCS})
@@ Expand All @@
     target_compile_features(${QATERIAL_TARGET} PUBLIC cxx_std_17)
     target_include_directories(${QATERIAL_TARGET} PRIVATE src ${QATERIAL_ICONS_OUTPUT_FOLDER})
+    # Glob all include directories in src Qaterial
+    file(GLOB_RECURSE QATERIAL_INCLUDE_DIRS LIST_DIRECTORIES true RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/Qaterial/*)
+    # Add to include directories
+    foreach(INCLUDE_DIR ${QATERIAL_INCLUDE_DIRS})
+      # Convert to absolute path, because IS_DIRECTORY only works with absolute paths
+      get_filename_component(INCLUDE_DIR_ABS ${INCLUDE_DIR} ABSOLUTE)
+      if(IS_DIRECTORY ${INCLUDE_DIR_ABS})
+        get_filename_component(INCLUDE_DIR_NAME ${INCLUDE_DIR} NAME)
+        if(NOT INCLUDE_DIR_NAME STREQUAL "Pch")
+          message(VERBOSE "Adding include directory: ${INCLUDE_DIR}")
+          target_include_directories(${QATERIAL_TARGET} PRIVATE ${INCLUDE_DIR})
+        endif()
+      endif()
+    endforeach()
     target_include_directories(${QATERIAL_TARGET} PUBLIC
       $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
       $<INSTALL_INTERFACE:include>
     )
     if(QATERIAL_ENABLE_PCH AND COMMAND target_precompile_headers)
       target_precompile_headers(${QATERIAL_TARGET} PRIVATE src/Qaterial/Pch/Pch.hpp)
     endif()
+    add_subdirectory(qml)
+    include(cmake/QaterialGenerateIcons.cmake)
+    set(QATERIAL_ICONS_OUTPUT_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/Qaterial_icons")
+    set(QATERIAL_ICONS_CLASS_FILE "${QATERIAL_ICONS_OUTPUT_FOLDER}/Qaterial/Display/Icons.hpp")
+    set(QATERIAL_ICONS_SRC_FILE "${QATERIAL_ICONS_OUTPUT_FOLDER}/Qaterial/Display/Icons.cpp")
+    qaterial_generate_icons_class(${QATERIAL_ICONS_CLASS_FILE} ${QATERIAL_ICONS_SRC_FILE})
+    set(QATERIAL_GEN_SRCS
+        ${QATERIAL_ICONS_CLASS_FILE}
+        ${QATERIAL_ICONS_SRC_FILE}
+    )
+    target_sources(${QATERIAL_TARGET} PRIVATE ${QATERIAL_GEN_SRCS})
+    target_include_directories(${QATERIAL_TARGET} PRIVATE ${QATERIAL_ICONS_OUTPUT_FOLDER})
+    target_include_directories(${QATERIAL_TARGET} PRIVATE ${QATERIAL_ICONS_OUTPUT_FOLDER}/Qaterial/Display)
     target_link_libraries(${QATERIAL_TARGET}
-      PRIVATE ${QATERIAL_TARGET}::Icons
-      PRIVATE ${QATERIAL_TARGET}::Fonts
-      PRIVATE ${QATERIAL_TARGET}::Components
       PUBLIC QOlm::QOlm
       PUBLIC Qt::Core
       PUBLIC Qt::Gui
@@ Expand Down Expand Up / @@ -276,6 +311,11 @@ if (QATERIAL_ENABLE_INSTALL) @@
         EXPORT ${QATERIAL_TARGET}Targets
       )
+      install(DIRECTORY ${QATERIAL_OUTPUT_DIR}
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/qml/
+        FILES_MATCHING PATTERN "*.qml" PATTERN "qmldir" PATTERN "*.qmltypes" PATTERN "*.dll" PATTERN "*.so"
+      )
       foreach(HDR_FILE ${QATERIAL_PUBLIC_HEADERS})
         get_filename_component(HDR_DIRECTORY ${HDR_FILE} DIRECTORY)
         get_filename_component(ABSOLUTE_HDR_DIRECTORY ${HDR_DIRECTORY} ABSOLUTE)
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -94,7 +94,8 @@ function(_qaterial_generate_icons_class HEADER SRC) @@
           "class QATERIAL_API_ Icons : public QObject\n"
           "{\n"
           "    Q_OBJECT\n"
-          "    QATERIAL_SINGLETON_IMPL(Icons, icons, Icons);\n\n"
+          "    QML_ELEMENT\n"
+          "    QML_SINGLETON\n\n"
           "public:\n"
           "    Icons(QObject* parent = nullptr) : QObject(parent) {}\n\n"
           )
@@ Expand Down Expand Up / @@ -165,10 +166,6 @@ function(_qaterial_generate_icons_class HEADER SRC) @@
           "#include <Qaterial/Display/Icons.hpp>\n"
           "#include \"moc_Icons.cpp\"\n"
           "\n"
-          "void __Qaterial_registerIconsSingleton()\n"
-          "{\n"
-          "    qaterial::Icons::registerSingleton()\;\n"
-          "}\n"
         )
         file(WRITE ${OUT_FILENAME_ABS_CPP}.temp ${OUT_CONTENT_CPP})
@@ Expand All @@
           NAME ${OUTPUT_FILE_HPP}
           NAME_CPP ${OUTPUT_FILE_CPP}
           CLASS_NAME "Icons"
-          PREFIX "Qaterial/Icons"
+          PREFIX "/Qaterial/Icons"
           GLOB_EXPRESSION ${QATERIAL_ICONS})
       else()
@@ Expand All @@
           "class QATERIAL_API_ Icons : public QObject\n"
           "{\n"
           "    Q_OBJECT\n"
-          "    QATERIAL_SINGLETON_IMPL(Icons, icons, Icons);\n\n"
+          "    QML_ELEMENT\n"
+          "    QML_SINGLETON\n\n"
           "public:\n"
           "    Icons(QObject* parent = nullptr) : QObject(parent) {}\n\n"
           "};\n\n"
@@ Expand All @@
           "// Everything written here will be lost.\n\n"
           "#include <Qaterial/Display/Icons.hpp>\n"
           "#include \"moc_Icons.cpp\"\n"
-          "void __Qaterial_registerIconsSingleton()\n"
-          "{\n"
-          "    qaterial::Icons::registerSingleton();\n"
-          "}\n"
         )
       endif()
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -17,32 +17,23 @@ file(GLOB_RECURSE QATERIAL_QML_FILES @@
     )
     set(SINGLETON_FILES
+      ${CMAKE_CURRENT_SOURCE_DIR}/Calendar.qml
       ${CMAKE_CURRENT_SOURCE_DIR}/Style.qml
       ${CMAKE_CURRENT_SOURCE_DIR}/Colors.qml
       ${CMAKE_CURRENT_SOURCE_DIR}/DataFormat.qml
       ${CMAKE_CURRENT_SOURCE_DIR}/DateFormat.qml
       ${CMAKE_CURRENT_SOURCE_DIR}/DialogManager.qml
       ${CMAKE_CURRENT_SOURCE_DIR}/SnackbarManager.qml
-      ${CMAKE_CURRENT_SOURCE_DIR}/Style.qml
     )
     set_source_files_properties(${SINGLETON_FILES} PROPERTIES QT_QML_SINGLETON_TYPE TRUE)
-    qt_add_library(${QATERIAL_TARGET}Components STATIC)
-    qt_add_qml_module(${QATERIAL_TARGET}Components
-      URI Qaterial
-      VERSION 1.0
-      RESOURCE_PREFIX "/"
-      QML_FILES
-        ${QATERIAL_QML_FILES}
-      OUTPUT_TARGETS QATERIAL_COMPONENTS_QML_TARGETS
-      NO_PLUGIN
+    qt_target_qml_sources(${QATERIAL_TARGET}
+      QML_FILES ${QATERIAL_QML_FILES}
+      NO_CACHEGEN
     )
-    add_library(${QATERIAL_TARGET}::Components ALIAS ${QATERIAL_TARGET}Components)
-    set_target_properties(${QATERIAL_TARGET}Components PROPERTIES AUTORCC TRUE)
-    target_link_libraries(${QATERIAL_TARGET}Components PRIVATE
+    target_link_libraries(${QATERIAL_TARGET} PRIVATE
       Qt::Core
       Qt::Gui
       Qt::Svg
@@ Expand All / @@ -52,26 +43,3 @@ target_link_libraries(${QATERIAL_TARGET}Components PRIVATE @@
       Qt::QuickControls2
       Qt::Core5Compat
     )
-    if(QATERIAL_FOLDER_PREFIX)
-      set_target_properties(${QATERIAL_TARGET}Components PROPERTIES FOLDER ${QATERIAL_FOLDER_PREFIX})
-    endif()
-    if(QATERIAL_ENABLE_INSTALL AND NOT QATERIAL_BUILD_SHARED)
-      include(GNUInstallDirs)
-      install(TARGETS ${QATERIAL_TARGET}Components ${QATERIAL_COMPONENTS_QML_TARGETS}
-        EXPORT ${QATERIAL_TARGET}ComponentsTargets
-      )
-      export(EXPORT ${QATERIAL_TARGET}ComponentsTargets
-        FILE "${CMAKE_CURRENT_BINARY_DIR}/${QATERIAL_TARGET}/${QATERIAL_TARGET}ComponentsTargets.cmake"
-      )
-      set(ConfigPackageLocation lib/cmake/${QATERIAL_TARGET})
-      install(EXPORT ${QATERIAL_TARGET}ComponentsTargets
-        FILE
-        ${QATERIAL_TARGET}ComponentsTargets.cmake
-        DESTINATION
-        ${ConfigPackageLocation}
-      )
-    endif()

-Original file line number
+Diff line change
@@ Expand Up / @@ -85,42 +85,15 @@ foreach(QATERIAL_FONT_FILE ${QATERIAL_FONTS_FILES}) @@
       )
     endforeach()
-    qt_add_library(${QATERIAL_TARGET}Fonts STATIC ${QATERIAL_FONTS_QML_QRC})
-    qt_add_resources(${QATERIAL_TARGET}Fonts "${QATERIAL_TARGET}Fonts"
+    qt_add_resources(${QATERIAL_TARGET} "${QATERIAL_TARGET}Fonts"
       FILES ${QATERIAL_FONTS_FILES}
       PREFIX "/Qaterial/Fonts"
-      OUTPUT_TARGETS QATERIAL_FONTS_QML_TARGETS
     )
-    add_library(${QATERIAL_TARGET}::Fonts ALIAS ${QATERIAL_TARGET}Fonts)
-    set_target_properties(${QATERIAL_TARGET}Fonts PROPERTIES AUTORCC TRUE)
-    target_link_libraries(${QATERIAL_TARGET}Fonts PRIVATE
+    target_link_libraries(${QATERIAL_TARGET} PRIVATE
       Qt::Core
       Qt::Gui
       Qt::Svg
       Qt::Xml
       Qt::Qml
     )
-    if(QATERIAL_FOLDER_PREFIX)
-      set_target_properties(${QATERIAL_TARGET}Fonts PROPERTIES FOLDER ${QATERIAL_FOLDER_PREFIX})
-    endif()
-    if(QATERIAL_ENABLE_INSTALL AND NOT QATERIAL_BUILD_SHARED)
-      include(GNUInstallDirs)
-      install(TARGETS ${QATERIAL_TARGET}Fonts ${QATERIAL_FONTS_QML_TARGETS}
-        EXPORT ${QATERIAL_TARGET}FontsTargets
-      )
-      export(EXPORT ${QATERIAL_TARGET}FontsTargets
-        FILE "${CMAKE_CURRENT_BINARY_DIR}/${QATERIAL_TARGET}/${QATERIAL_TARGET}FontsTargets.cmake"
-      )
-      set(ConfigPackageLocation lib/cmake/${QATERIAL_TARGET})
-      install(EXPORT ${QATERIAL_TARGET}FontsTargets
-        FILE
-        ${QATERIAL_TARGET}FontsTargets.cmake
-        DESTINATION
-        ${ConfigPackageLocation}
-      )
-    endif()

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DoNotMerge] ✨Use declarative macros for better Qt integration (e.g. QDS) #172

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Thiesius Apr 19, 2025

Uh oh!

Thiesius Apr 19, 2025

Uh oh!

OlivierLDff Apr 20, 2025

Uh oh!

Thiesius Apr 19, 2025

Uh oh!

Thiesius Apr 19, 2025

Uh oh!

Thiesius Apr 19, 2025

Uh oh!

Thiesius Apr 19, 2025

Uh oh!

Thiesius Apr 19, 2025

Uh oh!

Thiesius Apr 19, 2025

Uh oh!

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up / @@ -39,47 +39,18 @@ if(QATERIAL_ENABLE_ICONS) @@
           QT_RESOURCE_ALIAS ${QATERIAL_ICON_FILE_NAME}
         )
       endforeach()
-    endif()
-    qt_add_library(${QATERIAL_TARGET}Icons STATIC)
-    if(QATERIAL_ENABLE_ICONS)
-      qt_add_resources(${QATERIAL_TARGET}Icons "${QATERIAL_TARGET}Icons"
-        PREFIX "/Qaterial/Icons"
+      qt_add_resources(${QATERIAL_TARGET} "${QATERIAL_TARGET}Icons"
+        PREFIX "/Icons"
         FILES ${QATERIAL_ICONS_FILES}
-        OUTPUT_TARGETS QATERIAL_ICONS_QML_TARGETS
-      )
-    endif()
-    add_library(${QATERIAL_TARGET}::Icons ALIAS ${QATERIAL_TARGET}Icons)
-    target_link_libraries(${QATERIAL_TARGET}Icons PRIVATE
-      Qt::Core
-      Qt::Gui
-      Qt::Svg
-      Qt::Xml
-      Qt::Qml
-    )
-    if(QATERIAL_FOLDER_PREFIX)
-      set_target_properties(${QATERIAL_TARGET}Icons PROPERTIES FOLDER ${QATERIAL_FOLDER_PREFIX})
-    endif()
-    if(QATERIAL_ENABLE_INSTALL AND NOT QATERIAL_BUILD_SHARED)
-      include(GNUInstallDirs)
-      install(TARGETS ${QATERIAL_TARGET}Icons ${QATERIAL_ICONS_QML_TARGETS}
-        EXPORT ${QATERIAL_TARGET}IconsTargets
       )
-      export(EXPORT ${QATERIAL_TARGET}IconsTargets
-        FILE "${CMAKE_CURRENT_BINARY_DIR}/${QATERIAL_TARGET}/${QATERIAL_TARGET}IconsTargets.cmake"
+      target_link_libraries(${QATERIAL_TARGET} PRIVATE
+        Qt::Core
+        Qt::Gui
+        Qt::Svg
+        Qt::Xml
+        Qt::Qml
       )
-      set(ConfigPackageLocation lib/cmake/${QATERIAL_TARGET})
-      install(EXPORT ${QATERIAL_TARGET}IconsTargets
-        FILE
-        ${QATERIAL_TARGET}IconsTargets.cmake
-        DESTINATION
-        ${ConfigPackageLocation}
-      )
-    endif()
+    endif()

-Original file line number
+Diff line change
@@ Expand Up / @@ -22,5 +22,4 @@ Qaterial.Dialog @@
       parent: Overlay.overlay
       property int dialogImplicitWidth: Qaterial.Style.dialog.implicitWidth
-      implicitWidth: Math.floor(Math.min(parent.width - 2 * Qaterial.Style.card.horizontalPadding, dialogImplicitWidth))
     } // Dialog

[DoNotMerge] ✨Use declarative macros for better Qt integration (e.g. QDS) #172

Are you sure you want to change the base?

Uh oh!

[DoNotMerge] ✨Use declarative macros for better Qt integration (e.g. QDS) #172

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!