Skip to content

Commit 45132c6

Browse files
committed
Ubuntu 22.04: Update to Qt6
1 parent 88049b1 commit 45132c6

2 files changed

Lines changed: 21 additions & 16 deletions

File tree

README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,13 @@ googletest).
3838

3939
### `ubuntu-22.04`
4040

41-
Based on Ubuntu 22.04, containing Qt and OpenCascade OCE from the official
42-
Ubuntu package repository. This image is intended to check if LibrePCB
43-
compiles on a standard Ubuntu 22.04.
41+
Based on Ubuntu 22.04, containing Qt from the official Ubuntu package
42+
repository. This image is intended to check if LibrePCB compiles on a standard
43+
Ubuntu 22.04.
44+
45+
In addition, this image contains necessary tools for dynamic linking of
46+
LibrePCB (pkg-config, libdxflib, libmuparser, libquazip, libpolyclipping,
47+
googletest).
4448

4549
### `windowsservercore-ltsc2019-qt6.6-64bit`
4650

ubuntu-22.04/Dockerfile

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,43 +9,44 @@ RUN apt-get update -q && apt-get -y -q install --no-install-recommends \
99
cmake \
1010
curl \
1111
dbus \
12-
doxygen \
1312
file \
1413
g++ \
1514
git \
16-
graphviz \
15+
googletest \
1716
libc++-dev \
1817
libc++abi-dev \
18+
libdxflib-dev \
19+
libdxflib3 \
1920
libglu1-mesa-dev \
20-
liboce-*-dev \
21-
libqt5opengl5 \
22-
libqt5opengl5-dev \
23-
libqt5sql5-sqlite \
24-
libqt5svg5-dev \
21+
libgmock-dev \
22+
libgtest-dev \
23+
libmuparser-dev \
24+
libmuparser2v5 \
25+
libocct-*-dev \
26+
libpolyclipping-dev \
27+
libpolyclipping22 \
2528
libqt6core5compat6-dev \
2629
libqt6opengl6-dev \
2730
libqt6openglwidgets6 \
2831
libqt6sql6-sqlite \
2932
libqt6svg6-dev \
33+
libtbb2-dev \
34+
libxi-dev \
3035
make \
3136
ninja-build \
37+
occt-misc \
3238
openssl \
39+
pkg-config \
3340
python3 \
3441
python3-pip \
3542
python3-setuptools \
3643
python3-wheel \
37-
qt5-image-formats-plugins \
3844
qt6-base-dev \
3945
qt6-declarative-dev \
4046
qt6-image-formats-plugins \
4147
qt6-l10n-tools \
4248
qt6-tools-dev \
4349
qt6-tools-dev-tools \
44-
qtbase5-dev \
45-
qtdeclarative5-dev \
46-
qtquickcontrols2-5-dev \
47-
qttools5-dev \
48-
qttools5-dev-tools \
4950
wget \
5051
xvfb \
5152
zlib1g \

0 commit comments

Comments
 (0)