Skip to content

Commit db11427

Browse files
committed
Ubuntu: Remove Qt5 Compat & declarative modules
1 parent 72f5a8d commit db11427

3 files changed

Lines changed: 0 additions & 14 deletions

File tree

ubuntu-20.04-qt6.6/Dockerfile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -162,21 +162,11 @@ RUN wget -c "${QT_URL}qtsvg-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64.7z" -O /tmp
162162
&& 7za x /tmp.7z -o/opt/qt \
163163
&& rm /tmp.7z
164164

165-
# Install Qt Declarative
166-
RUN wget -c "${QT_URL}qtdeclarative-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64.7z" -O /tmp.7z \
167-
&& 7za x /tmp.7z -o/opt/qt \
168-
&& rm /tmp.7z
169-
170165
# Install Qt Translations
171166
RUN wget -c "${QT_URL}qttranslations-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64.7z" -O /tmp.7z \
172167
&& 7za x /tmp.7z -o/opt/qt \
173168
&& rm /tmp.7z
174169

175-
# Install Qt5 Compat
176-
RUN wget -c "${QT_BASEURL}/qt.qt6.662.qt5compat.gcc_64/6.6.2-0-202402121133qt5compat-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64.7z" -O /tmp.7z \
177-
&& 7za x /tmp.7z -o/opt/qt \
178-
&& rm /tmp.7z
179-
180170
# Install Qt Image Formats Plugin
181171
RUN wget -c "${QT_BASEURL}/qt.qt6.662.addons.qtimageformats.gcc_64/6.6.2-0-202402121133qtimageformats-Linux-RHEL_8_8-GCC-Linux-RHEL_8_8-X86_64.7z" -O /tmp.7z \
182172
&& 7za x /tmp.7z -o/opt/qt \

ubuntu-22.04/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ RUN apt-get update -q && apt-get -y -q install --no-install-recommends \
2727
libocct-*-dev \
2828
libpolyclipping-dev \
2929
libpolyclipping22 \
30-
libqt6core5compat6-dev \
3130
libqt6opengl6-dev \
3231
libqt6openglwidgets6 \
3332
libqt6sql6-sqlite \
@@ -44,7 +43,6 @@ RUN apt-get update -q && apt-get -y -q install --no-install-recommends \
4443
python3-setuptools \
4544
python3-wheel \
4645
qt6-base-dev \
47-
qt6-declarative-dev \
4846
qt6-image-formats-plugins \
4947
qt6-l10n-tools \
5048
qt6-tools-dev \

ubuntu-24.04/Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ RUN apt-get update -q && apt-get -y -q install --no-install-recommends \
2727
libocct-*-dev \
2828
libpolyclipping-dev \
2929
libpolyclipping22 \
30-
libqt6core5compat6-dev \
3130
libqt6opengl6-dev \
3231
libqt6openglwidgets6 \
3332
libqt6sql6-sqlite \
@@ -46,7 +45,6 @@ RUN apt-get update -q && apt-get -y -q install --no-install-recommends \
4645
python3-setuptools \
4746
python3-wheel \
4847
qt6-base-dev \
49-
qt6-declarative-dev \
5048
qt6-image-formats-plugins \
5149
qt6-l10n-tools \
5250
qt6-tools-dev \

0 commit comments

Comments
 (0)