3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-04-29 18:27:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

[docker] update to Qt 5.13

Browse source
This commit is contained in:
Fabien Castan 2019-08-07 10:25:11 +02:00
parent aac10be31d
commit 94c8c15b01
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -9,7 +9,7 @@ LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com"
ENV MESHROOM_DEV=/opt/Meshroom \ ENV MESHROOM_DEV=/opt/Meshroom \
MESHROOM_BUILD=/tmp/Meshroom_build \ MESHROOM_BUILD=/tmp/Meshroom_build \
MESHROOM_BUNDLE=/opt/Meshroom_bundle \ MESHROOM_BUNDLE=/opt/Meshroom_bundle \
QT_DIR=/opt/qt/5.11.1/gcc_64 \ QT_DIR=/opt/qt/5.13.0/gcc_64 \
PATH="${PATH}:${MESHROOM_BUNDLE}" PATH="${PATH}:${MESHROOM_BUNDLE}"
COPY . "${MESHROOM_DEV}" COPY . "${MESHROOM_DEV}"
@ -52,6 +52,7 @@ RUN source scl_source enable rh-python36 && cd "${MESHROOM_DEV}" && pip install
# Install Qt (to build plugins) # Install Qt (to build plugins)
WORKDIR /tmp/qt WORKDIR /tmp/qt
# Qt version in specified in docker/qt-installer-noninteractive.qs
RUN curl -LO http://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run && \ RUN curl -LO http://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run && \
chmod u+x qt-unified-linux-x64-online.run && \ chmod u+x qt-unified-linux-x64-online.run && \
./qt-unified-linux-x64-online.run --verbose --platform minimal --script "${MESHROOM_DEV}/docker/qt-installer-noninteractive.qs" && \ ./qt-unified-linux-x64-online.run --verbose --platform minimal --script "${MESHROOM_DEV}/docker/qt-installer-noninteractive.qs" && \

16
docker/qt-installer-noninteractive.qs
View file

@ -46,14 +46,14 @@ Controller.prototype.ComponentSelectionPageCallback = function() {
widget.deselectAll(); widget.deselectAll();
// widget.selectComponent("qt"); // widget.selectComponent("qt");
// widget.selectComponent("qt.qt5.5111"); // widget.selectComponent("qt.qt5.5130");
widget.selectComponent("qt.qt5.5111.gcc_64"); widget.selectComponent("qt.qt5.5130.gcc_64");
// widget.selectComponent("qt.qt5.5111.qtscript"); // widget.selectComponent("qt.qt5.5130.qtscript");
// widget.selectComponent("qt.qt5.5111.qtscript.gcc_64"); // widget.selectComponent("qt.qt5.5130.qtscript.gcc_64");
// widget.selectComponent("qt.qt5.5111.qtwebengine"); // widget.selectComponent("qt.qt5.5130.qtwebengine");
// widget.selectComponent("qt.qt5.5111.qtwebengine.gcc_64"); // widget.selectComponent("qt.qt5.5130.qtwebengine.gcc_64");
// widget.selectComponent("qt.qt5.5111.qtwebglplugin"); // widget.selectComponent("qt.qt5.5130.qtwebglplugin");
// widget.selectComponent("qt.qt5.5111.qtwebglplugin.gcc_64"); // widget.selectComponent("qt.qt5.5130.qtwebglplugin.gcc_64");
// widget.selectComponent("qt.tools"); // widget.selectComponent("qt.tools");
gui.clickButton(buttons.NextButton); gui.clickButton(buttons.NextButton);