Add Qt 6 FreeBSD CI

master
Volker Krause 2 years ago committed by Vlad Zahorodnii
parent f19957bdb2
commit 346ac6f32b

@ -5,6 +5,7 @@ include:
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
- https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
suse_tumbleweed_qt515_reduced_featureset: suse_tumbleweed_qt515_reduced_featureset:
extends: suse_tumbleweed_qt515 extends: suse_tumbleweed_qt515

@ -15,6 +15,7 @@
#include <QRect> #include <QRect>
#include <QVector> #include <QVector>
#include <memory> #include <memory>
#include <vector>
class MockGpu; class MockGpu;
class MockFb; class MockFb;

@ -94,7 +94,7 @@ EglDmabufBuffer::EglDmabufBuffer(EGLImage image,
DmaBufAttributes &&attrs, DmaBufAttributes &&attrs,
quint32 flags, quint32 flags,
EglDmabuf *interfaceImpl) EglDmabuf *interfaceImpl)
: EglDmabufBuffer(QVector{image}, std::move(attrs), flags, interfaceImpl) : EglDmabufBuffer(QVector<EGLImage>{image}, std::move(attrs), flags, interfaceImpl)
{ {
m_importType = ImportType::Direct; m_importType = ImportType::Direct;
} }

@ -283,7 +283,7 @@ RemoteMatch WindowsRunner::windowsMatch(const Window *window, const WindowsRunne
RemoteImage remoteImage{ RemoteImage remoteImage{
convertedImage.width(), convertedImage.width(),
convertedImage.height(), convertedImage.height(),
convertedImage.bytesPerLine(), static_cast<int>(convertedImage.bytesPerLine()),
true, // hasAlpha true, // hasAlpha
8, // bitsPerSample 8, // bitsPerSample
4, // channels 4, // channels

@ -320,9 +320,7 @@ QList<int> ScriptedEffect::touchEdgesForAction(const QString &action) const
{ {
QList<int> ret; QList<int> ret;
if (m_exclusiveCategory == QStringLiteral("show-desktop") && action == QStringLiteral("show-desktop")) { if (m_exclusiveCategory == QStringLiteral("show-desktop") && action == QStringLiteral("show-desktop")) {
const QVector borders({ElectricTop, ElectricRight, ElectricBottom, ElectricLeft}); for (const auto b : {ElectricTop, ElectricRight, ElectricBottom, ElectricLeft}) {
for (const auto b : borders) {
if (workspace()->screenEdges()->actionForTouchBorder(b) == ElectricActionShowDesktop) { if (workspace()->screenEdges()->actionForTouchBorder(b) == ElectricActionShowDesktop) {
ret.append(b); ret.append(b);
} }

Loading…
Cancel
Save