From b4a1e1bbf4ee6ae7d89aa339489eadc7b7fa5f14 Mon Sep 17 00:00:00 2001 From: Digital Artifex <7929434+DigitalArtifex@users.noreply.github.com> Date: Tue, 25 Aug 2026 04:45:09 -0400 Subject: [PATCH] Renamed Controls and Kero modules --- CMakeLists.txt | 5 +++-- KomplexHubModule/CMakeLists.txt | 1 + KomplexHubModule/Constants.qml | 6 +++--- KomplexHubModule/Controls/CMakeLists.txt | 5 +++-- KomplexHubModule/Kero/CMakeLists.txt | 7 ++++--- qds.cmake | 4 ++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c866e11..149aef1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.21.1) option(LINK_INSIGHT "Link Qt Insight Tracker library" ON) option(BUILD_QDS_COMPONENTS "Build design studio components" ON) -project(KomplexHub LANGUAGES CXX) +project(KomplexHub VERSION 1.0 LANGUAGES CXX) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -21,7 +21,7 @@ set(QML_IMPORT_PATH ${QT_QML_OUTPUT_DIRECTORY} ) find_package( - Qt6 6.8 + Qt6 REQUIRED COMPONENTS Core Gui @@ -38,6 +38,7 @@ qt_standard_project_setup() qt_add_executable(${CMAKE_PROJECT_NAME} ) +set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VERSION "1.0") qt_add_resources(${CMAKE_PROJECT_NAME} "configuration" PREFIX "/" diff --git a/KomplexHubModule/CMakeLists.txt b/KomplexHubModule/CMakeLists.txt index 89d84d1..3caf62f 100644 --- a/KomplexHubModule/CMakeLists.txt +++ b/KomplexHubModule/CMakeLists.txt @@ -18,5 +18,6 @@ qt6_add_qml_module(KomplexHubModule "WallpaperModelData.qml" ) +set_target_properties(KomplexHubModule PROPERTIES VERSION "1.0") add_subdirectory("Controls") add_subdirectory("Kero") diff --git a/KomplexHubModule/Constants.qml b/KomplexHubModule/Constants.qml index ab25c90..f9bd061 100644 --- a/KomplexHubModule/Constants.qml +++ b/KomplexHubModule/Constants.qml @@ -63,7 +63,7 @@ QtObject { readonly property int normalAnimationDuration: 250 readonly property int fastAnimationDuration: 125 - property StudioApplication application: StudioApplication { - fontPath: Qt.resolvedUrl("../KomplexHubContent/" + relativeFontDirectory) - } + // property StudioApplication application: StudioApplication { + // fontPath: Qt.resolvedUrl("../KomplexHubContent/" + relativeFontDirectory) + // } } diff --git a/KomplexHubModule/Controls/CMakeLists.txt b/KomplexHubModule/Controls/CMakeLists.txt index 27b64d1..6701aa2 100644 --- a/KomplexHubModule/Controls/CMakeLists.txt +++ b/KomplexHubModule/Controls/CMakeLists.txt @@ -1,8 +1,8 @@ ### This file is automatically generated by Qt Design Studio. ### Do not change -qt_add_library(KomplexHubModule_Controls STATIC) -qt6_add_qml_module(KomplexHubModule_Controls +qt_add_library(KomplexHubControls STATIC) +qt6_add_qml_module(KomplexHubControls URI "KomplexHub.Controls" VERSION 1.0 RESOURCE_PREFIX "/qt/qml" @@ -22,3 +22,4 @@ qt6_add_qml_module(KomplexHubModule_Controls "BackgroundImage.qml" ) +#set_target_properties(KomplexHubControls PROPERTIES VERSION "1.0") diff --git a/KomplexHubModule/Kero/CMakeLists.txt b/KomplexHubModule/Kero/CMakeLists.txt index d411f1e..f2013dc 100644 --- a/KomplexHubModule/Kero/CMakeLists.txt +++ b/KomplexHubModule/Kero/CMakeLists.txt @@ -1,5 +1,5 @@ -qt_add_library(KomplexHubModule_Kero STATIC) -qt6_add_qml_module(KomplexHubModule_Kero +qt_add_library(KomplexHubKero STATIC) +qt6_add_qml_module(KomplexHubKero URI "KomplexHub.Kero" VERSION 1.0 RESOURCE_PREFIX "/qt/qml" @@ -13,4 +13,5 @@ qt6_add_qml_module(KomplexHubModule_Kero "KeroWarningAvatar.qml" "KeroHeader.qml" "KeroSuccessAvatar.qml" -) \ No newline at end of file +) +#set_target_properties(KomplexHubKero PROPERTIES VERSION "1.0") \ No newline at end of file diff --git a/qds.cmake b/qds.cmake index 8b816b6..078a993 100644 --- a/qds.cmake +++ b/qds.cmake @@ -11,8 +11,8 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE KomplexHubModuleplugin KomplexHubContentplugin KomplexHubPluginplugin - KomplexHubModule_Controlsplugin - KomplexHubModule_Keroplugin + KomplexHubControlsplugin + KomplexHubKeroplugin Qt6::Quick Qt6::Core Qt6::Gui