diff --git a/cicd/gitlab-ci.yml b/cicd/gitlab-ci.yml index 64ce51a2090709dcfa3149c7b1cbc92a70725f7b..39080a183c9ae42a0ac1978e98d3bcf4cccfec41 100644 --- a/cicd/gitlab-ci.yml +++ b/cicd/gitlab-ci.yml @@ -1,8 +1,8 @@ variables: # QT version and emsdk version must be compatible. # See https://doc.qt.io/qt-6/wasm.html - QDS_CI_QT_VERSION: "6.6.1" - QDS_CI_EMSDK_VERSION: "3.1.37" + QDS_CI_QT_VERSION: "6.7.1" + QDS_CI_EMSDK_VERSION: "3.1.50" QDS_CI_ARTIFACTS_PATH: "${CI_PROJECT_DIR}/artifacts" DEBIAN_FRONTEND: non-interactive GIT_SUBMODULE_STRATEGY: recursive diff --git a/cicd/stages/release.yml b/cicd/stages/release.yml index 5692c254072ee01bc33acec66840aa2e83827fb0..bddb8d49b95a8e4aeeb9ab217cbcc38760922443 100644 --- a/cicd/stages/release.yml +++ b/cicd/stages/release.yml @@ -36,7 +36,6 @@ create-release: - job: create-packages artifacts: true variables: - QDS_PACKAGE_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/design-viewer/${CI_COMMIT_TAG}" QDS_RELEASE_NAME: "Design Viewer - ${CI_COMMIT_TAG}" QDS_RELEASE_DESCRIPTION: "This version is built with Qt-${QDS_CI_QT_VERSION}." release: @@ -46,9 +45,9 @@ create-release: assets: links: - name: "Binary Packages" - url: "https://git.qt.io/design-studio/cloud-services/design-viewer-app/-/packages" + url: "https://git.qt.io/design-studio/design-viewer/design-viewer-wasm/-/packages" link_type: "package" - - name: "Docker Images - WASM" + - name: "Docker Images For Qt" url: "https://git.qt.io/design-studio/maintenance/docker-images/container_registry/142" link_type: "image" script: diff --git a/emsdk b/emsdk index b113f24842c6e97fe3e352084db09a6e278593ae..e2627e265d940db5ea58dffa63e490375bfc92e5 160000 --- a/emsdk +++ b/emsdk @@ -1 +1 @@ -Subproject commit b113f24842c6e97fe3e352084db09a6e278593ae +Subproject commit e2627e265d940db5ea58dffa63e490375bfc92e5 diff --git a/www/scripts/script.js b/www/scripts/script.js index dd45283f87d3e7cae24084f37b15e172d1ff8717..2a44c5a488eb6ef45d6e33a3e702d8519e30c20d 100644 --- a/www/scripts/script.js +++ b/www/scripts/script.js @@ -276,7 +276,7 @@ async function loadProjector() { console.error("Exit code: " + exitData.code); console.error("Exit data: " + JSON.stringify(exitData)); }, - entryFunction: window.createQtAppInstance, + entryFunction: window.qtdesignviewer_entry, containerElements: [container] } });