Skip to content
Snippets Groups Projects
Commit 52b4341b authored by calrama's avatar calrama
Browse files

centos-7: Update Qt to 5.12.7

parent 502469f3
Branches
No related tags found
No related merge requests found
Pipeline #26545 passed
Pipeline: interfaces

#26554

    Pipeline: behavior_loader

    #26553

      ...@@ -97,10 +97,11 @@ RUN version=1.10.5 && \ ...@@ -97,10 +97,11 @@ RUN version=1.10.5 && \
      rm -rf hdf5-${version}* rm -rf hdf5-${version}*
      # Qt # Qt
      ENV Qt5_DIR /opt/qt5/5.12.6/gcc_64/lib/cmake/Qt5 ENV Qt5_DIR /opt/qt5/5.12.7/gcc_64/lib/cmake/Qt5
      ADD qtifwsilent.qs /tmp/qtifwsilent.qs ADD qtifwsilent.qs /tmp/qtifwsilent.qs
      RUN version=5.12.6 && \ RUN version=5.12.7 && \
      yum install -y \ yum install -y \
      libxkbcommon-x11 \
      pulseaudio-libs \ pulseaudio-libs \
      pulseaudio-libs-glib2 \ pulseaudio-libs-glib2 \
      gstreamer1-plugins-base \ gstreamer1-plugins-base \
      ...@@ -112,7 +113,8 @@ RUN version=5.12.6 && \ ...@@ -112,7 +113,8 @@ RUN version=5.12.6 && \
      chmod +x qt-opensource-linux-x64-${version}.run && \ chmod +x qt-opensource-linux-x64-${version}.run && \
      env QT_INSTALL_DIR=/opt/qt5 ./qt-opensource-linux-x64-${version}.run --script qtifwsilent.qs -platform minimal && \ env QT_INSTALL_DIR=/opt/qt5 ./qt-opensource-linux-x64-${version}.run --script qtifwsilent.qs -platform minimal && \
      rm -f qt-opensource-linux-x64-${version}.run && \ rm -f qt-opensource-linux-x64-${version}.run && \
      rm -f qtifwsilent.qs rm -f qtifwsilent.qs && \
      echo "/opt/qt5/${version}/gcc_64/lib" > /etc/ld.so.conf.d/qt5.conf
      # linuxdeployqt # linuxdeployqt
      RUN version=6 && \ RUN version=6 && \
      ...@@ -336,12 +338,6 @@ RUN version=0.9.9.5 && \ ...@@ -336,12 +338,6 @@ RUN version=0.9.9.5 && \
      ADD agki-nas01.imp.fu-berlin.de-ca-cert.crt /etc/pki/ca-trust/source/anchors/agki-nas01.imp.fu-berlin.de-ca-cert.crt ADD agki-nas01.imp.fu-berlin.de-ca-cert.crt /etc/pki/ca-trust/source/anchors/agki-nas01.imp.fu-berlin.de-ca-cert.crt
      RUN update-ca-trust RUN update-ca-trust
      # Potential runtime dependencies for AppImages
      RUN yum install -y \
      libxkbcommon-x11 \
      && \
      yum clean all
      # Additional development dependencies # Additional development dependencies
      RUN yum install -y \ RUN yum install -y \
      libepoxy-devel \ libepoxy-devel \
      ...@@ -356,5 +352,4 @@ RUN yum install -y \ ...@@ -356,5 +352,4 @@ RUN yum install -y \
      twine twine
      ADD ldconfig/local.conf /etc/ld.so.conf.d/local.conf ADD ldconfig/local.conf /etc/ld.so.conf.d/local.conf
      ADD ldconfig/qt5.conf /etc/ld.so.conf.d/qt5.conf
      RUN ldconfig RUN ldconfig
      /opt/qt5/5.12.6/gcc_64/lib
      ...@@ -25,8 +25,8 @@ Controller.prototype.TargetDirectoryPageCallback = function() { ...@@ -25,8 +25,8 @@ Controller.prototype.TargetDirectoryPageCallback = function() {
      Controller.prototype.ComponentSelectionPageCallback = function() { Controller.prototype.ComponentSelectionPageCallback = function() {
      var widget = gui.currentPageWidget(); var widget = gui.currentPageWidget();
      widget.deselectAll(); widget.deselectAll();
      widget.selectComponent("qt.qt5.5126.gcc_64"); widget.selectComponent("qt.qt5.5127.gcc_64");
      widget.selectComponent("qt.qt5.5126.qtcharts"); widget.selectComponent("qt.qt5.5127.qtcharts");
      gui.clickButton(buttons.NextButton); gui.clickButton(buttons.NextButton);
      } }
      ......
      0% Loading or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Please register or to comment