@@ -5,8 +5,8 @@ FROM ubuntu:${OS_CODENAME}
55# Redeclare ARGs after FROM
66ARG OS_CODENAME
77ARG DEBIAN_FRONTEND=noninteractive
8- ARG QT_VERSION=5.15 .2
9- ARG QT_MODULES=
8+ ARG QT_VERSION=6.8 .2
9+ ARG QT_MODULES="-m qtmultimedia qtserialport"
1010ARG QT_HOST=linux
1111ARG QT_TARGET=desktop
1212ARG QT_INSTALL_DIR=/opt/qt
@@ -86,17 +86,14 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
8686# Install Qt - adapted from
8787# https://github.com/miurahr/aqtinstall/
8888# https://github.com/vslotman/docker-aqtinstall
89- ENV QT_BASE_DIR=${QT_INSTALL_DIR}/${QT_VERSION}/gcc_64
90- ENV PATH=${QT_BASE_DIR}/bin:$PATH
91- ENV QT_PLUGIN_PATH=${QT_BASE_DIR}/plugins/
92- ENV QML_IMPORT_PATH=${QT_BASE_DIR}/qml/
93- ENV QML2_IMPORT_PATH=${QT_BASE_DIR}/qml/
94- ENV LD_LIBRARY_PATH=${QT_BASE_DIR}/lib:$LD_LIBRARY_PATH
95- ENV PKG_CONFIG_PATH=${QT_BASE_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
96-
97- RUN uvx --no-cache --from aqtinstall aqt install-qt --outputdir ${QT_INSTALL_DIR} ${QT_HOST} ${QT_TARGET} ${QT_VERSION} ${QT_ARCH} ${QT_MODULES} && \
98- strip --remove-section=.note.ABI-tag ${QT_BASE_DIR}/lib/libQt5Core.so.${QT_VERSION}
89+ ENV PATH=${QT_INSTALL_DIR}/bin:$PATH
90+ ENV QT_PLUGIN_PATH=${QT_INSTALL_DIR}/plugins/
91+ ENV QML_IMPORT_PATH=${QT_INSTALL_DIR}/qml/
92+ ENV QML2_IMPORT_PATH=${QT_INSTALL_DIR}/qml/
93+ ENV LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib:$LD_LIBRARY_PATH
94+ ENV PKG_CONFIG_PATH=${QT_INSTALL_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
9995
96+ RUN uvx --no-cache --from aqtinstall aqt install-qt --outputdir ${QT_INSTALL_DIR} ${QT_HOST} ${QT_TARGET} ${QT_VERSION} ${QT_ARCH} ${QT_MODULES}
10097# Install ARM toolchain
10198RUN wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_ARM_VERSION}/binrel/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz -O - \
10299 | tar -xJ -C /opt
0 commit comments