From 49300e88c183edc0d58d051b3a14a9418b85b9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Burak=20Han=C3=A7erli?= <burak.hancerli@qt.io>
Date: Wed, 10 Jul 2024 13:52:28 +0000
Subject: [PATCH] QDS-13206 Update to Qt 6.7.1
---
cicd/gitlab-ci.yml | 4 ++--
cicd/stages/release.yml | 5 ++---
emsdk | 2 +-
www/scripts/script.js | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/cicd/gitlab-ci.yml b/cicd/gitlab-ci.yml
index 64ce51a..39080a1 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 5692c25..bddb8d4 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 b113f24..e2627e2 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 dd45283..2a44c5a 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]
}
});
--
GitLab