jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 19:47:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

remove dependency on deprecated qt5 libraries for qt6 (#4692)

Browse source 
* remove dependency on deprecated qt5 libraries for qt6

removes the use of qt6-5compat for builds
replaces use of QRegExp with QRegularExpression
fixes incorrect usage of QRegExp
removes use of QTextCodec
fixes incorrect usage of QTextCodec
sets qtlinguist as a required component for qt6

* fix anchoredPattern not existing in qt 5.11
This commit is contained in:
ebbit1q 2022-10-31 23:24:11 +01:00 • committed by GitHub
parent f619ef23fd
commit dec2a252fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 65 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.ci/Fedora36/Dockerfile
View file

@ -7,7 +7,7 @@ RUN dnf install -y \
git \
mariadb-devel \
protobuf-devel \
qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets,qt5compat}-devel \
qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
rpm-build \
xz-devel \
zlib-devel \

1
.ci/UbuntuJammy/Dockerfile
View file

@ -13,7 +13,6 @@ RUN apt-get update && \
liblzma-dev \
libmariadb-dev-compat \
libprotobuf-dev \
libqt6core5compat6-dev \
libqt6multimedia6 \
libqt6sql6-mysql \
libqt6svg6-dev \