diff --git a/libs/ApplicationCore/CMakeLists.txt b/libs/ApplicationCore/CMakeLists.txt index e329717956..29238783e8 100644 --- a/libs/ApplicationCore/CMakeLists.txt +++ b/libs/ApplicationCore/CMakeLists.txt @@ -14,6 +14,8 @@ qt6_standard_project_setup() qt6_add_qml_module(ApplicationCore URI Status.ApplicationCore VERSION 1.0 + + OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/ApplicationCore ) add_library(Status::ApplicationCore ALIAS ApplicationCore) diff --git a/libs/Onboarding/qml/Status/Onboarding/SetupNewProfileView.qml b/libs/Onboarding/qml/Status/Onboarding/SetupNewProfileView.qml index c9e710fcef..e1a6a99b5c 100644 --- a/libs/Onboarding/qml/Status/Onboarding/SetupNewProfileView.qml +++ b/libs/Onboarding/qml/Status/Onboarding/SetupNewProfileView.qml @@ -59,6 +59,8 @@ Item { id: swipeView anchors.fill: parent + interactive: false + Repeater { id: pageRepeater model: pagesModel diff --git a/libs/Onboarding/tests/OnboardingTestHelpers/CMakeLists.txt b/libs/Onboarding/tests/OnboardingTestHelpers/CMakeLists.txt index d80bfa6139..b3af05fed3 100644 --- a/libs/Onboarding/tests/OnboardingTestHelpers/CMakeLists.txt +++ b/libs/Onboarding/tests/OnboardingTestHelpers/CMakeLists.txt @@ -13,29 +13,31 @@ find_package(GTest REQUIRED) find_package(Qt6 ${STATUS_QT_VERSION} COMPONENTS Quick Qml REQUIRED) qt6_standard_project_setup() -qt6_add_qml_module(${PROJECT_NAME} - URI Status.${PROJECT_NAME} +qt6_add_qml_module(OnboardingTestHelpers + URI Status.OnboardingTestHelpers VERSION 1.0 -) -add_library(Status::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) -target_include_directories(${PROJECT_NAME} + OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/OnboardingTestHelpers/ +) +add_library(Status::OnboardingTestHelpers ALIAS OnboardingTestHelpers) + +target_include_directories(OnboardingTestHelpers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) -target_sources(${PROJECT_NAME} +target_sources(OnboardingTestHelpers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ScopedTestAccount.h ${CMAKE_CURRENT_SOURCE_DIR}/Constants.h - + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ScopedTestAccount.cpp ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -target_link_libraries(${PROJECT_NAME} +target_link_libraries(OnboardingTestHelpers PUBLIC Qt6::Quick Qt6::Qml diff --git a/libs/StatusQ/CMakeLists.txt b/libs/StatusQ/CMakeLists.txt index b3aa40a589..a4aae6f9b2 100644 --- a/libs/StatusQ/CMakeLists.txt +++ b/libs/StatusQ/CMakeLists.txt @@ -9,7 +9,7 @@ set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS true) find_package(Qt6 ${STATUS_QT_VERSION} COMPONENTS Quick Qml REQUIRED) qt6_standard_project_setup() -qt6_add_qml_module(${PROJECT_NAME} +qt6_add_qml_module(StatusQ URI Status VERSION 1.0 @@ -26,7 +26,7 @@ add_subdirectory(qml/Status/Controls) add_subdirectory(qml/Status/Core) add_subdirectory(tests) -target_link_libraries(${PROJECT_NAME} +target_link_libraries(StatusQ PRIVATE Qt6::Quick Qt6::Qml @@ -43,6 +43,6 @@ list(REMOVE_DUPLICATES QML_IMPORT_PATH) install( TARGETS - ${PROJECT_NAME} + StatusQ RUNTIME ) diff --git a/libs/StatusQ/qml/Status/Controls/CMakeLists.txt b/libs/StatusQ/qml/Status/Controls/CMakeLists.txt index 22ffc8dbba..7c211b2186 100644 --- a/libs/StatusQ/qml/Status/Controls/CMakeLists.txt +++ b/libs/StatusQ/qml/Status/Controls/CMakeLists.txt @@ -21,7 +21,7 @@ qt6_add_qml_module(${PROJECT_NAME} add_subdirectory(Navigation) -target_link_libraries(${PROJECT_NAME} +target_link_libraries(OnboardingTestHelpers PRIVATE Qt6::Quick Qt6::Qml diff --git a/libs/StatusQ/tests/TestHelpers/CMakeLists.txt b/libs/StatusQ/tests/TestHelpers/CMakeLists.txt index aa0467ce6f..773723cca1 100644 --- a/libs/StatusQ/tests/TestHelpers/CMakeLists.txt +++ b/libs/StatusQ/tests/TestHelpers/CMakeLists.txt @@ -13,18 +13,20 @@ find_package(GTest REQUIRED) find_package(Qt6 ${STATUS_QT_VERSION} COMPONENTS Quick Qml REQUIRED) qt6_standard_project_setup() -qt6_add_qml_module(${PROJECT_NAME} - URI Status.${PROJECT_NAME} +qt6_add_qml_module(TestHelpers + URI Status.TestHelpers VERSION 1.0 -) -add_library(Status::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) -target_include_directories(${PROJECT_NAME} + OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/TestHelpers +) +add_library(Status::TestHelpers ALIAS TestHelpers) + +target_include_directories(TestHelpers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) -target_sources(${PROJECT_NAME} +target_sources(TestHelpers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/MonitorQtOutput.h ${CMAKE_CURRENT_SOURCE_DIR}/IOTestHelpers.h @@ -36,7 +38,7 @@ target_sources(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ) -target_link_libraries(${PROJECT_NAME} +target_link_libraries(TestHelpers PUBLIC Qt6::Quick Qt6::Qml diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 75ed25d3d0..bf8ad3b4c7 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -22,6 +22,8 @@ qt6_add_qml_module(${PROJECT_NAME} infura_key node-config.json RESOURCE_PREFIX "" + + OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/StaticConfig ) add_library(Status::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) diff --git a/ui/fonts/CMakeLists.txt b/ui/fonts/CMakeLists.txt index dc13cad117..f21239e3b8 100644 --- a/ui/fonts/CMakeLists.txt +++ b/ui/fonts/CMakeLists.txt @@ -20,6 +20,8 @@ qt6_add_qml_module(${PROJECT_NAME} Inter/Inter-Regular.otf RESOURCE_PREFIX "" + + OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/FontsAssets ) target_link_libraries(${PROJECT_NAME} diff --git a/ui/imports/assets/CMakeLists.txt b/ui/imports/assets/CMakeLists.txt index ab07ad83ae..81f7c3317c 100644 --- a/ui/imports/assets/CMakeLists.txt +++ b/ui/imports/assets/CMakeLists.txt @@ -32,6 +32,8 @@ qt6_add_qml_module(${PROJECT_NAME} png/status-logo.png RESOURCE_PREFIX "" + + OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Status/UiAssets ) target_link_libraries(${PROJECT_NAME}