Skip to content

Commit

Permalink
Upgrade to Qt 6.4.1
Browse files Browse the repository at this point in the history
The build unfortunately fail due to too old CMake version.

Proposal for root-cause fix: emscripten-core/emsdk#1135
  • Loading branch information
forderud committed Dec 4, 2022
1 parent ab5a734 commit 533a2cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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/
Expand All @@ -53,7 +53,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}"
Expand Down
4 changes: 2 additions & 2 deletions image/build_image.bat
Original file line number Diff line number Diff line change
@@ -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
)

0 comments on commit 533a2cf

Please sign in to comment.