From a738e61672b0902204fced791a8510d0028141d2 Mon Sep 17 00:00:00 2001 From: EndrII Date: Wed, 23 Sep 2020 15:43:10 +0300 Subject: [PATCH] fix missing qml modules of wasm --- Site/CMakeLists.txt | 9 +-------- Site/QuasarAppLib | 2 +- Site/deployWasm.json | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Site/CMakeLists.txt b/Site/CMakeLists.txt index 2188bda..50ba8b2 100644 --- a/Site/CMakeLists.txt +++ b/Site/CMakeLists.txt @@ -57,11 +57,4 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core ViewSolutions QuasarApp target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src") target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src/Models") -if (DEFINED TARGET_PLATFORM_TOOLCHAIN) - if (${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32") - message(added deploy step for site) - set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "${PROJECT_NAME}.js") - - addDeployFromFile(deployWasm.json) - endif(${TARGET_PLATFORM_TOOLCHAIN} STREQUAL "wasm32") -endif(DEFINED TARGET_PLATFORM_TOOLCHAIN) +initWasmSupport(${PROJECT_NAME} deployWasm.json) diff --git a/Site/QuasarAppLib b/Site/QuasarAppLib index 9d22f8a..f84faab 160000 --- a/Site/QuasarAppLib +++ b/Site/QuasarAppLib @@ -1 +1 @@ -Subproject commit 9d22f8a2190bb81e94ee4e063957297e7fc8266c +Subproject commit f84faab0ddfda32f165633a9c18df4898434f0c4 diff --git a/Site/deployWasm.json b/Site/deployWasm.json index ccf43f4..c813ab8 100644 --- a/Site/deployWasm.json +++ b/Site/deployWasm.json @@ -7,6 +7,7 @@ "./src/Wrapper/index.html" ], "binOut": "/", + "clear": true, "libOut": "/", "targetDir": "./DeploymentSite" }