diff --git a/Dockerfile b/Dockerfile index 093b5158..f7e2dace 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ LABEL maintainer="AliceVision Team alicevision-team@googlegroups.com" ENV MESHROOM_DEV=/opt/Meshroom \ MESHROOM_BUILD=/tmp/Meshroom_build \ MESHROOM_BUNDLE=/opt/Meshroom_bundle \ - QT_DIR=/opt/qt/5.11.0/gcc_64 \ + QT_DIR=/opt/qt/5.11.1/gcc_64 \ PATH="${PATH}:${MESHROOM_BUNDLE}" COPY . "${MESHROOM_DEV}" diff --git a/docker/qt-installer-noninteractive.qs b/docker/qt-installer-noninteractive.qs index 169631d4..18224cd1 100644 --- a/docker/qt-installer-noninteractive.qs +++ b/docker/qt-installer-noninteractive.qs @@ -46,14 +46,14 @@ Controller.prototype.ComponentSelectionPageCallback = function() { widget.deselectAll(); // widget.selectComponent("qt"); - // widget.selectComponent("qt.qt5.5110"); - widget.selectComponent("qt.qt5.5110.gcc_64"); - // widget.selectComponent("qt.qt5.5110.qtscript"); - // widget.selectComponent("qt.qt5.5110.qtscript.gcc_64"); - // widget.selectComponent("qt.qt5.5110.qtwebengine"); - // widget.selectComponent("qt.qt5.5110.qtwebengine.gcc_64"); - // widget.selectComponent("qt.qt5.5110.qtwebglplugin"); - // widget.selectComponent("qt.qt5.5110.qtwebglplugin.gcc_64"); + // widget.selectComponent("qt.qt5.5111"); + widget.selectComponent("qt.qt5.5111.gcc_64"); + // widget.selectComponent("qt.qt5.5111.qtscript"); + // widget.selectComponent("qt.qt5.5111.qtscript.gcc_64"); + // widget.selectComponent("qt.qt5.5111.qtwebengine"); + // widget.selectComponent("qt.qt5.5111.qtwebengine.gcc_64"); + // widget.selectComponent("qt.qt5.5111.qtwebglplugin"); + // widget.selectComponent("qt.qt5.5111.qtwebglplugin.gcc_64"); // widget.selectComponent("qt.tools"); gui.clickButton(buttons.NextButton);