Skip to content
Snippets Groups Projects

QDS-11148 - Qt6.6 integration

Merged Morten Sorvig requested to merge QDS-11148/6.6-loader-fix into master
Files
10
+ 17
34
# QDS_CI_BUILD_QT_VERSION_ANDROID and QDS_CI_BUILD_QT_VERSION_WASM are the tags for the docker images.
# https://git.qt.io/design-studio/maintenance/docker-images/container_registry
.build-base:
rules:
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web"
build-wasm-multiarch:
build-wasm:
stage: build
extends: .build-base
tags:
- linux-blade
rules:
- if: $QDS_CI_QT_VERSION == "643" && $QDS_CI_JOB_TARGET_ARCH == "32"
- if: $QDS_CI_QT_VERSION != "643" && $QDS_CI_JOB_TARGET_ARCH == "singlethread"
- if: $QDS_CI_QT_VERSION != "643" && $QDS_CI_JOB_TARGET_ARCH == "multithread"
parallel:
matrix:
- QDS_CI_JOB_TARGET_ARCH:
- "32"
- "singlethread"
- "multithread"
- if: $CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "merge_request_event"
variables:
QDS_BUILD_PATH: "${CI_PROJECT_DIR}/outdir/build"
QDS_CI_BUILD_PATH: "${CI_PROJECT_DIR}/outdir/build"
QDS_CI_JOB_TARGET_ARCH: "singlethread"
QDS_CI_JOB_TARGET_PLATFORM: "wasm"
QDS_CI_JOB_ARTIFACTS_PATH: ${QDS_CI_ARTIFACTS_PATH}/${QDS_CI_JOB_TARGET_PLATFORM}/${QDS_CI_JOB_TARGET_ARCH}
artifacts:
@@ -31,46 +18,42 @@ build-wasm-multiarch:
- ${QDS_CI_ARTIFACTS_PATH}
reports:
dotenv: build.env
image: "git.qt.io:4567/design-studio/maintenance/docker-images/${QDS_CI_JOB_TARGET_PLATFORM}:${QDS_CI_QT_VERSION}-${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}"
image: "git.qt.io:4567/design-studio/maintenance/docker-images/qt-full:${QDS_CI_QT_VERSION}"
script:
- mkdir -p ${QDS_CI_JOB_ARTIFACTS_PATH}
- |
if [[ ${QDS_CI_QT_VERSION} == "643" ]]; then
EMSDK_VERSION="3.1.14"
elif [[ ${QDS_CI_QT_VERSION} == "652" ]]; then
EMSDK_VERSION="3.1.25"
fi
- |
cd emsdk
./emsdk install ${EMSDK_VERSION}
./emsdk activate ${EMSDK_VERSION}
./emsdk install 3.1.37
./emsdk activate 3.1.37
source emsdk_env.sh
cd ..
- echo ${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}
- echo ${DOCKER_ENV_QT_PATH_LINUX_GCC_64}
- |
cd qtquickdesigner-components
cmake \
-S . \
-G Ninja \
-DCMAKE_TOOLCHAIN_FILE=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}/lib/cmake/Qt6/qt.toolchain.cmake \
-DQT_HOST_PATH=${QT_PATH}/${QT_VERSION}/gcc_64 \
-DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}/lib/cmake/Qt6/qt.toolchain.cmake \
-DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
-DCMAKE_C_COMPILER=${EMSDK}/upstream/emscripten/emcc \
-DCMAKE_CXX_COMPILER=${EMSDK}/upstream/emscripten/em++ \
-DCMAKE_INSTALL_PREFIX=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}
-DCMAKE_INSTALL_PREFIX=${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}
- cmake --build .
- cmake --install .
- cd ..
- |
cmake \
-S . \
-B ${QDS_BUILD_PATH} \
-B ${QDS_CI_BUILD_PATH} \
-G Ninja \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_TOOLCHAIN_FILE=${QT_PATH}/${QT_VERSION}/${QDS_CI_JOB_TARGET_PLATFORM}_${QDS_CI_JOB_TARGET_ARCH}/lib/cmake/Qt6/qt.toolchain.cmake \
-DQT_HOST_PATH=${QT_PATH}/${QT_VERSION}/gcc_64 \
-DCMAKE_TOOLCHAIN_FILE=${DOCKER_ENV_QT_PATH_WASM_SINGLETHREAD}/lib/cmake/Qt6/qt.toolchain.cmake \
-DQT_HOST_PATH=${DOCKER_ENV_QT_PATH_LINUX_GCC_64} \
-DCMAKE_C_COMPILER=${EMSDK}/upstream/emscripten/emcc \
-DCMAKE_CXX_COMPILER=${EMSDK}/upstream/emscripten/em++ \
-DCMAKE_INSTALL_PREFIX=${QDS_CI_JOB_ARTIFACTS_PATH}
- cmake --build ${QDS_BUILD_PATH}
- cmake --install ${QDS_BUILD_PATH}
- cmake --build ${QDS_CI_BUILD_PATH}
- cmake --install ${QDS_CI_BUILD_PATH}
- echo "PREVIOUS_JOB_ID=${CI_JOB_ID}" >> build.env
- echo "JOB_TARGET_ARCH=${QDS_CI_JOB_TARGET_ARCH}" >> build.env
Loading