jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-24 23:53:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

set the minimum qt6 version to 6.4

Browse source 
this will be separate from the qt5 removal after release
This commit is contained in:
ebbit1q 2026-04-12 21:17:05 +02:00
parent 8cc65b8967
commit 24fcaccb58
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.ci/Ubuntu22.04/Dockerfile
View file

@ -9,20 +9,18 @@ RUN apt-get update && \
file \ file \
g++ \ g++ \
git \ git \
libgl-dev \
liblzma-dev \ liblzma-dev \
libmariadb-dev-compat \ libmariadb-dev-compat \
libprotobuf-dev \ libprotobuf-dev \
libqt6multimedia6 \ libqt5multimedia5-plugins \
libqt6sql6-mysql \ libqt5sql5-mysql \
libqt6svg6-dev \ libqt5svg5-dev \
libqt6websockets6-dev \ libqt5websockets5-dev \
ninja-build \ ninja-build \
protobuf-compiler \ protobuf-compiler \
qt6-image-formats-plugins \ qt5-image-formats-plugins \
qt6-l10n-tools \ qtmultimedia5-dev \
qt6-multimedia-dev \ qttools5-dev \
qt6-tools-dev \ qttools5-dev-tools \
qt6-tools-dev-tools \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

2
cmake/FindQtRuntime.cmake
View file

@ -42,7 +42,7 @@ list(REMOVE_DUPLICATES REQUIRED_QT_COMPONENTS)
if(NOT FORCE_USE_QT5) if(NOT FORCE_USE_QT5)
# Linguist is now a component in Qt6 instead of an external package # Linguist is now a component in Qt6 instead of an external package
find_package( find_package(
Qt6 6.2.3 Qt6 6.4.2
COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist COMPONENTS ${REQUIRED_QT_COMPONENTS} Linguist
QUIET HINTS ${Qt6_DIR} QUIET HINTS ${Qt6_DIR}
) )