From 6f10ec0ded9546a54fc886f63ccdcae94310e95d Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Sat, 19 Nov 2022 23:59:17 +0100 Subject: [PATCH] Upgrade to Qt 6.4.1 The build unfortunately fail due to too old CMake version. Proposal for root-cause fix: https://github.com/emscripten-core/emsdk/pull/1135 --- image/Dockerfile | 6 +++--- image/build_image.bat | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/image/Dockerfile b/image/Dockerfile index 6b41c60..c1aba08 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -12,7 +12,7 @@ RUN cp GE_External_Root_CA_2_1.crt /usr/local/share/ca-certificates/ RUN update-ca-certificates # Clone Qt sources -RUN git clone --branch=5.15.2 https://code.qt.io/qt/qt5.git +RUN git clone --branch=6.4.1 https://code.qt.io/qt/qt5.git WORKDIR /development/qt5 RUN ./init-repository @@ -35,7 +35,7 @@ RUN cp GE_External_Root_CA_2_1.crt /usr/local/share/ca-certificates/ RUN update-ca-certificates # Copy Qt binaries to new container -COPY --from=qtbuilder /usr/local/Qt-5.15.2/ /usr/local/Qt-5.15.2/ +COPY --from=qtbuilder /usr/local/Qt-6.4.1/ /usr/local/Qt-6.4.1/ # Install Boost & Eigen # https://docs.docker.com/develop/develop-images/dockerfile_best-practices/ @@ -49,7 +49,7 @@ RUN mkdir -p /project/dependencies/include && mkdir -p /project/dependencies/lib ln -s /usr/include/boost /project/dependencies/include/boost && \ ln -s /usr/include/eigen3 /project/dependencies/include/eigen3 && \ ln -s /usr/lib/cmake /project/dependencies/lib/cmake && \ - ln -s /usr/local/Qt-5.15.2 /project/Qt + ln -s /usr/local/Qt-6.4.1 /project/Qt # Add qmake to PATH (doesn't seem to work) #ENV PATH="/project/Qt/bin:${PATH}" diff --git a/image/build_image.bat b/image/build_image.bat index c873164..704c0fe 100644 --- a/image/build_image.bat +++ b/image/build_image.bat @@ -1,7 +1,7 @@ :: Build container -docker build --file Dockerfile --tag=forderud/qtwasm:latest . +docker build --file Dockerfile --tag=forderud/qtwasm:qt6 . IF %ERRORLEVEL% EQU 0 ( :: Push to dockerhub - docker push forderud/qtwasm:latest + docker push forderud/qtwasm:qt6 )