diff --git a/content/CMakeLists.txt b/content/CMakeLists.txt index 9f2a563..47117be 100644 --- a/content/CMakeLists.txt +++ b/content/CMakeLists.txt @@ -1,6 +1,8 @@ ### This file is automatically generated by Qt Design Studio. ### Do not change + + qt_add_library(content STATIC) qt6_add_qml_module(content URI "content" @@ -9,6 +11,5 @@ qt6_add_qml_module(content QML_FILES App.qml Screen01.ui.qml - RESOURCES - fonts/fonts.txt + ) diff --git a/imports/ExportTest/CMakeLists.txt b/imports/ExportTest/CMakeLists.txt index 6ff29c8..0aba7d5 100644 --- a/imports/ExportTest/CMakeLists.txt +++ b/imports/ExportTest/CMakeLists.txt @@ -1,19 +1,22 @@ ### This file is automatically generated by Qt Design Studio. ### Do not change -qt_add_library(ExportTest STATIC) set_source_files_properties(Constants.qml PROPERTIES QT_QML_SINGLETON_TYPE true - ) +) + + +qt_add_library(ExportTest STATIC) qt6_add_qml_module(ExportTest URI "ExportTest" VERSION 1.0 RESOURCE_PREFIX "/qt/qml" - QML_FILES + QML_FILES Constants.qml DirectoryFontLoader.qml EventListModel.qml EventListSimulator.qml + ) diff --git a/qmlmodules b/qmlmodules index ac95e27..47b8b26 100644 --- a/qmlmodules +++ b/qmlmodules @@ -1,7 +1,7 @@ ### This file is automatically generated by Qt Design Studio. ### Do not change -qt6_add_qml_module(${CMAKE_PROJECT_NAME} +qt6_add_qml_module(ExportTestApp URI "Main" VERSION 1.0 RESOURCE_PREFIX "/qt/qml" @@ -11,8 +11,11 @@ qt6_add_qml_module(${CMAKE_PROJECT_NAME} add_subdirectory(content) add_subdirectory(imports) +add_subdirectory(asset_imports) -target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE + +target_link_libraries(ExportTestApp PRIVATE contentplugin ExportTestplugin + ) diff --git a/src/import_qml_plugins.h b/src/import_qml_plugins.h index 707cfd0..392b854 100644 --- a/src/import_qml_plugins.h +++ b/src/import_qml_plugins.h @@ -7,3 +7,4 @@ Q_IMPORT_QML_PLUGIN(contentPlugin) Q_IMPORT_QML_PLUGIN(ExportTestPlugin) +