jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

set the minimum qt6 version to 6.4 (#6811)
Some checks failed
Build Desktop / Configure (push) Has been cancelled
Details
Build Docker Image / amd64 & arm64 (push) Has been cancelled
Details
Build Desktop / Debian 11 (push) Has been cancelled
Details
Build Desktop / Debian 13 (push) Has been cancelled
Details
Build Desktop / Debian 12 (push) Has been cancelled
Details
Build Desktop / Fedora 43 (push) Has been cancelled
Details
Build Desktop / Fedora 42 (push) Has been cancelled
Details
Build Desktop / Servatrice_Debian 11 (push) Has been cancelled
Details
Build Desktop / Ubuntu 24.04 (push) Has been cancelled
Details
Build Desktop / Ubuntu 26.04 (push) Has been cancelled
Details
Build Desktop / Ubuntu 22.04 (push) Has been cancelled
Details
Build Desktop / Arch (push) Has been cancelled
Details
Build Desktop / macOS 14 (push) Has been cancelled
Details
Build Desktop / macOS 15 (push) Has been cancelled
Details
Build Desktop / macOS 13 Intel (push) Has been cancelled
Details
Build Desktop / macOS 15 Debug (push) Has been cancelled
Details
Build Desktop / Windows 10 (push) Has been cancelled
Details

Browse source 
* set the minimum qt6 version to 6.4

this will be separate from the qt5 removal after release

* add include for optional
This commit is contained in:
ebbit1q 2026-04-14 00:59:46 +02:00 • committed by GitHub
parent 338c56678a
commit f97864b72b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 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}
) )

1
cockatrice/src/interface/deck_loader/deck_loader.h
View file

@ -13,6 +13,7 @@
#include <QPrinter> #include <QPrinter>
#include <QTextCursor> #include <QTextCursor>
#include <libcockatrice/deck_list/deck_list.h> #include <libcockatrice/deck_list/deck_list.h>
#include <optional>
inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader"); inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader");

1
cockatrice/src/interface/pixel_map_generator.h
View file

@ -12,6 +12,7 @@
#include <QMap> #include <QMap>
#include <QPixmap> #include <QPixmap>
#include <libcockatrice/network/server/remote/user_level.h> #include <libcockatrice/network/server/remote/user_level.h>
#include <optional>
inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator"); inline Q_LOGGING_CATEGORY(PixelMapGeneratorLog, "pixel_map_generator");