Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update qt from 5.5 to 5.15 #488

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update qt from 5.5 to 5.15 #488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ci-scripts/dockerfiles/nitrokey-app-appimages-agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ ENV COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5 AF="-yq --no-install-suggests --no-inst
RUN apt-get -qq update && \
apt-get install ${AF} software-properties-common && \
add-apt-repository ppa:alexlarsson/flatpak && \
add-apt-repository ppa:beineri/opt-qt-5.15.0-xenial -y && \
apt-get -qq update && \
apt-get install ${AF} build-essential devscripts elfutils cmake libhidapi-dev libusb-1.0-0-dev g++-5 pkg-config qt5-default qttools5-dev-tools libqt5svg5-dev libqt5concurrent5 wget git curl fuse udev snapcraft flatpak-builder \
apt-get install ${AF} build-essential libgl-dev qt515svg qt515base devscripts elfutils cmake libhidapi-dev libusb-1.0-0-dev g++-5 pkg-config qttools5-dev-tools libqt5svg5-dev libqt5concurrent5 wget git curl fuse udev snapcraft flatpak-builder \
debhelper fakeroot bash-completion && \
wget -c -nv -P / "https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage" && \
wget -c -nv -P / "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage" && \
Expand All @@ -16,4 +17,4 @@ RUN apt-get -qq update && \
flatpak remote-add --if-not-exists kdeapps --from https://distribute.kde.org/kdeapps.flatpakrepo && \
flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && \
flatpak install -y flathub org.kde.Sdk//5.12 org.kde.Platform//5.12

RUN mkdir -p '/usr/lib/x86_64-linux-gnu/qtchooser/' && echo "/opt/qt515/bin\n/opt/qt515/lib\n" > /usr/lib/x86_64-linux-gnu/qtchooser/default.conf