diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-02-13 22:28:26 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-19 11:42:49 +0000 |
| commit | 49ace4593124456fb066a3eaee83fcbf16b1b804 (patch) | |
| tree | 7b21b9a1e6b36969a0a699409bafba1b48104e68 /docker/focal | |
| parent | 40baf2db26197545cac9ebe810c0399f7b10f0e8 (diff) | |
Add Qt6 docker image and update Qt5 image
...to add additional packages required for the Qt6 image
Change-Id: I42791440eaa754a1ae4ea3c24f86dd0ccedc1ed6
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'docker/focal')
| -rw-r--r-- | docker/focal/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile index e4e239529..22c5c3373 100644 --- a/docker/focal/Dockerfile +++ b/docker/focal/Dockerfile @@ -57,6 +57,7 @@ RUN apt-get update -qq && \ libnanopb-dev \ libprotobuf-dev \ libgrpc++-dev \ + libxkbcommon-x11-0 \ nanopb \ ninja-build \ nsis \ @@ -85,7 +86,7 @@ ENV LLVM_INSTALL_DIR=/usr/lib/llvm-8 # COPY scripts/install-qt.sh install-qt.sh -RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qtscript qttools qtx11extras qtscxml icu && \ +RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qtscript qttools qtx11extras qtscxml qt5compat icu && \ ./install-qt.sh --version ${QTCREATOR_VERSION} qtcreator && \ echo "export PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:/opt/Qt/Tools/QtCreator/bin:\${PATH}" > /etc/profile.d/qt.sh |