File tree 3 files changed +8
-7
lines changed
3 files changed +8
-7
lines changed Original file line number Diff line number Diff line change @@ -28,9 +28,9 @@ RUN $APT_UPDATE
28
28
29
29
# install qt5 or qt6 (qt6 is not available on debian buster/bullseye)
30
30
RUN if [ "$SUITE" = "bookworm" ] && [ "$QT_VERSION" = "6" ]; then \
31
- $APT_INSTALL qt6-base-dev libqt6serialport6 -dev libxkbcommon-dev libvulkan-dev libgl1-mesa-dev; \
31
+ $APT_INSTALL qt6-base-dev qt6-serialport-dev qt6-websockets -dev libxkbcommon-dev libvulkan-dev libgl1-mesa-dev; \
32
32
else \
33
- $APT_INSTALL qtbase5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev; \
33
+ $APT_INSTALL qtbase5-dev libqt5serialport5-dev libqt5websockets5-dev libqt5sql5-sqlite libqt5svg5-dev; \
34
34
fi
35
35
36
36
# install deps
Original file line number Diff line number Diff line change @@ -29,9 +29,9 @@ RUN dnf -y update
29
29
30
30
# install qt5 or qt6
31
31
RUN if [ "$QT_VERSION" = "6" ]; then \
32
- $DNF_INSTALL qt6-qtbase-devel qt6-qtserialport-devel libxkbcommon-devel; \
32
+ $DNF_INSTALL qt6-qtbase-devel qt6-qtserialport-devel qt6-qtwebsockets-devel libxkbcommon-devel; \
33
33
else \
34
- $DNF_INSTALL qt5-qtbase-devel qt5-qtserialport-devel qt5-qtx11extras-devel; \
34
+ $DNF_INSTALL qt5-qtbase-devel qt5-qtserialport-devel qt5-qtwebsockets-devel qt5- qtx11extras-devel; \
35
35
fi
36
36
37
37
# install general deps
Original file line number Diff line number Diff line change @@ -40,10 +40,11 @@ RUN if [ "$SUITE" != "buster" ] && [ "$SUITE" != "focal" ] && [ "$QT_VERSION" =
40
40
echo "deb http://deb.debian.org/debian bullseye-backports main contrib non-free" | tee -a /etc/apt/sources.list; \
41
41
$APT_UPDATE; \
42
42
fi; \
43
- if [ "$SUITE" = "trixie" ]; then SERIALPORT="qt6-serialport-dev"; else SERIALPORT="libqt6serialport6-dev"; fi; \
44
- $APT_INSTALL qt6-base-dev $SERIALPORT libqt6sql6-sqlite libxkbcommon-dev libvulkan-dev libgl1-mesa-dev; \
43
+ if [ "$SUITE" = "jammy" ]; then SERIALPORT="libqt6serialport6-dev"; else SERIALPORT="qt6-serialport-dev"; fi; \
44
+ if [ "$SUITE" = "jammy" ]; then WEBSOCKETS="libqt6websockets6-dev"; else WEBSOCKETS="qt6-websockets-dev"; fi; \
45
+ $APT_INSTALL qt6-base-dev $SERIALPORT $WEBSOCKETS libqt6sql6-sqlite libxkbcommon-dev libvulkan-dev libgl1-mesa-dev; \
45
46
else \
46
- $APT_INSTALL qtbase5-dev libqt5serialport5-dev libqt5sql5-sqlite libqt5svg5-dev; \
47
+ $APT_INSTALL qtbase5-dev libqt5serialport5-dev libqt5websockets5-dev libqt5sql5-sqlite libqt5svg5-dev; \
47
48
fi
48
49
49
50
# install general deps (all platforms/arch/os)
You can’t perform that action at this time.
0 commit comments