Skip to content

Commit afcef84

Browse files
Neil Hornepfeerick
authored andcommitted
fix paths and remove qt5 strip
1 parent bc1cdec commit afcef84

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

dev/Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,13 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
9090
# Install Qt - adapted from
9191
# https://github.com/miurahr/aqtinstall/
9292
# https://github.com/vslotman/docker-aqtinstall
93-
ENV PATH=${QT_INSTALL_DIR}/bin:$PATH
94-
ENV QT_PLUGIN_PATH=${QT_INSTALL_DIR}/plugins/
95-
ENV QML_IMPORT_PATH=${QT_INSTALL_DIR}/qml/
96-
ENV QML2_IMPORT_PATH=${QT_INSTALL_DIR}/qml/
97-
ENV LD_LIBRARY_PATH=${QT_INSTALL_DIR}/lib:$LD_LIBRARY_PATH
98-
ENV PKG_CONFIG_PATH=${QT_INSTALL_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
93+
ENV QT_BASE_DIR=${QT_INSTALL_DIR}/${QT_VERSION}/gcc_64
94+
ENV PATH=${QT_BASE_DIR}/bin:$PATH
95+
ENV QT_PLUGIN_PATH=${QT_BASE_DIR}/plugins/
96+
ENV QML_IMPORT_PATH=${QT_BASE_DIR}/qml/
97+
ENV QML2_IMPORT_PATH=${QT_BASE_DIR}/qml/
98+
ENV LD_LIBRARY_PATH=${QT_BASE_DIR}/lib
99+
ENV PKG_CONFIG_PATH=${QT_BASE_DIR}/lib/pkgconfig
99100

100101
RUN uvx --no-cache --from aqtinstall aqt install-qt --outputdir ${QT_INSTALL_DIR} ${QT_HOST} ${QT_TARGET} ${QT_VERSION} ${QT_ARCH} ${QT_MODULES}
101102

0 commit comments

Comments
 (0)