From 346ac6f32bd16b42225e5c4d76b03d433fcbad87 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Sat, 22 Oct 2022 11:22:37 +0200
Subject: [PATCH] Add Qt 6 FreeBSD CI

---
 .gitlab-ci.yml                                             | 1 +
 autotests/drm/mock_drm.h                                   | 1 +
 src/platformsupport/scenes/opengl/egl_dmabuf.cpp           | 2 +-
 src/plugins/krunner-integration/windowsrunnerinterface.cpp | 2 +-
 src/scripting/scriptedeffect.cpp                           | 4 +---
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c5651c873..9095d4ca5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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/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/freebsd-qt6.yml
 
 suse_tumbleweed_qt515_reduced_featureset:
     extends: suse_tumbleweed_qt515
diff --git a/autotests/drm/mock_drm.h b/autotests/drm/mock_drm.h
index a03151eaff..7358e27332 100644
--- a/autotests/drm/mock_drm.h
+++ b/autotests/drm/mock_drm.h
@@ -15,6 +15,7 @@
 #include <QRect>
 #include <QVector>
 #include <memory>
+#include <vector>
 
 class MockGpu;
 class MockFb;
diff --git a/src/platformsupport/scenes/opengl/egl_dmabuf.cpp b/src/platformsupport/scenes/opengl/egl_dmabuf.cpp
index d15bd0021d..6b749b0de8 100644
--- a/src/platformsupport/scenes/opengl/egl_dmabuf.cpp
+++ b/src/platformsupport/scenes/opengl/egl_dmabuf.cpp
@@ -94,7 +94,7 @@ EglDmabufBuffer::EglDmabufBuffer(EGLImage image,
                                  DmaBufAttributes &&attrs,
                                  quint32 flags,
                                  EglDmabuf *interfaceImpl)
-    : EglDmabufBuffer(QVector{image}, std::move(attrs), flags, interfaceImpl)
+    : EglDmabufBuffer(QVector<EGLImage>{image}, std::move(attrs), flags, interfaceImpl)
 {
     m_importType = ImportType::Direct;
 }
diff --git a/src/plugins/krunner-integration/windowsrunnerinterface.cpp b/src/plugins/krunner-integration/windowsrunnerinterface.cpp
index 9df2202511..4f8ec47dc7 100644
--- a/src/plugins/krunner-integration/windowsrunnerinterface.cpp
+++ b/src/plugins/krunner-integration/windowsrunnerinterface.cpp
@@ -283,7 +283,7 @@ RemoteMatch WindowsRunner::windowsMatch(const Window *window, const WindowsRunne
         RemoteImage remoteImage{
             convertedImage.width(),
             convertedImage.height(),
-            convertedImage.bytesPerLine(),
+            static_cast<int>(convertedImage.bytesPerLine()),
             true, // hasAlpha
             8, // bitsPerSample
             4, // channels
diff --git a/src/scripting/scriptedeffect.cpp b/src/scripting/scriptedeffect.cpp
index e0ba99e4a0..9dd15a56e7 100644
--- a/src/scripting/scriptedeffect.cpp
+++ b/src/scripting/scriptedeffect.cpp
@@ -320,9 +320,7 @@ QList<int> ScriptedEffect::touchEdgesForAction(const QString &action) const
 {
     QList<int> ret;
     if (m_exclusiveCategory == QStringLiteral("show-desktop") && action == QStringLiteral("show-desktop")) {
-        const QVector borders({ElectricTop, ElectricRight, ElectricBottom, ElectricLeft});
-
-        for (const auto b : borders) {
+        for (const auto b : {ElectricTop, ElectricRight, ElectricBottom, ElectricLeft}) {
             if (workspace()->screenEdges()->actionForTouchBorder(b) == ElectricActionShowDesktop) {
                 ret.append(b);
             }