Skip to content
Snippets Groups Projects
Commit 0c030771 authored by calrama's avatar calrama
Browse files

ubuntu18.04: Upgrade to Qt 5.12

parent 0840bbc8
No related branches found
No related tags found
No related merge requests found
...@@ -6,6 +6,7 @@ LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>" ...@@ -6,6 +6,7 @@ LABEL authors="Moritz Maxeiner <moritz.maxeiner@fu-berlin.de>"
ENV TZ=Europe/Berlin ENV TZ=Europe/Berlin
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
COPY qtifwsilent.qs /tmp/qtifwsilent.qs
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends software-properties-common && \ apt-get install -y --no-install-recommends software-properties-common && \
add-apt-repository ppa:ubuntu-toolchain-r/test -y && \ add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
...@@ -33,10 +34,6 @@ RUN apt-get update && \ ...@@ -33,10 +34,6 @@ RUN apt-get update && \
graphviz \ graphviz \
fuse \ fuse \
ffmpeg \ ffmpeg \
qt5-default \
qtbase5-dev \
qtmultimedia5-dev \
libqt5charts5-dev \
libboost-all-dev \ libboost-all-dev \
libopenblas-dev \ libopenblas-dev \
liblapack-dev \ liblapack-dev \
...@@ -47,7 +44,6 @@ RUN apt-get update && \ ...@@ -47,7 +44,6 @@ RUN apt-get update && \
libglm-dev \ libglm-dev \
libegl1-mesa-dev \ libegl1-mesa-dev \
libcgal-dev \ libcgal-dev \
libcgal-qt5-dev \
libjsoncpp-dev \ libjsoncpp-dev \
libwebsocketpp-dev \ libwebsocketpp-dev \
libfreetype6-dev \ libfreetype6-dev \
...@@ -58,8 +54,15 @@ RUN apt-get update && \ ...@@ -58,8 +54,15 @@ RUN apt-get update && \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-distutils && \ python3-distutils && \
cd /tmp && \
curl -sSLO https://download.qt.io/official_releases/qt/5.12/5.12.4/qt-opensource-linux-x64-5.12.4.run && \
chmod +x qt-opensource-linux-x64-5.12.4.run && \
env QT_INSTALL_DIR=/opt/qt5 ./qt-opensource-linux-x64-5.12.4.run --script qtifwsilent.qs -platform minimal && \
rm qt-opensource-linux-x64-5.12.4.run && \
rm qtifwsilent.qs && \
curl -sSL -o /usr/local/bin/linuxdeployqt https://github.com/probonopd/linuxdeployqt/releases/download/5/linuxdeployqt-5-x86_64.AppImage && \ curl -sSL -o /usr/local/bin/linuxdeployqt https://github.com/probonopd/linuxdeployqt/releases/download/5/linuxdeployqt-5-x86_64.AppImage && \
chmod +x /usr/local/bin/linuxdeployqt chmod +x /usr/local/bin/linuxdeployqt
ENV Qt5_DIR /opt/qt5/5.12.4/gcc_64/lib/cmake/Qt5
RUN python3.7 -m pip --no-cache-dir install \ RUN python3.7 -m pip --no-cache-dir install \
graphviz \ graphviz \
......
function Controller() {
installer.autoRejectMessageBoxes();
installer.installationFinished.connect(function() {
gui.clickButton(buttons.NextButton);
})
}
Controller.prototype.WelcomePageCallback = function() {
gui.clickButton(buttons.NextButton, 7000);
}
Controller.prototype.CredentialsPageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.IntroductionPageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.TargetDirectoryPageCallback = function() {
gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.environmentVariable("QT_INSTALL_DIR"));
gui.clickButton(buttons.NextButton);
}
Controller.prototype.ComponentSelectionPageCallback = function() {
var widget = gui.currentPageWidget();
widget.deselectAll();
widget.selectComponent("qt.qt5.5124.gcc_64");
widget.selectComponent("qt.qt5.5124.qtcharts");
gui.clickButton(buttons.NextButton);
}
Controller.prototype.LicenseAgreementPageCallback = function() {
gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
gui.clickButton(buttons.NextButton);
}
Controller.prototype.StartMenuDirectoryPageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.ReadyForInstallationPageCallback = function() {
gui.clickButton(buttons.NextButton);
}
Controller.prototype.FinishedPageCallback = function() {
var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm;
if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox)
checkBoxForm.launchQtCreatorCheckBox.checked = false;
gui.clickButton(buttons.FinishButton);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment