diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc6e8a7..66c3691 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ jobs: name: Nix strategy: matrix: - qtver: [qt6.10.0, qt6.9.2, qt6.9.1, qt6.9.0, qt6.8.3, qt6.8.2, qt6.8.1, qt6.8.0, qt6.7.3, qt6.7.2, qt6.7.1, qt6.7.0, qt6.6.3, qt6.6.2, qt6.6.1, qt6.6.0] + qtver: [qt6.10.1, qt6.10.0, qt6.9.2, qt6.9.1, qt6.9.0, qt6.8.3, qt6.8.2, qt6.8.1, qt6.8.0, qt6.7.3, qt6.7.2, qt6.7.1, qt6.7.0, qt6.6.3, qt6.6.2, qt6.6.1, qt6.6.0] compiler: [clang, gcc] runs-on: ubuntu-latest permissions: diff --git a/ci/nix-checkouts.nix b/ci/nix-checkouts.nix index 8ef997d..945973c 100644 --- a/ci/nix-checkouts.nix +++ b/ci/nix-checkouts.nix @@ -10,6 +10,11 @@ let in rec { latest = qt6_10_0; + qt6_10_1 = byCommit { + commit = "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38"; + sha256 = "0fvbizl7j5rv2rf8j76yw0xb3d9l06hahkjys2a7k1yraznvnafm"; + }; + qt6_10_0 = byCommit { commit = "c5ae371f1a6a7fd27823bc500d9390b38c05fa55"; sha256 = "18g0f8cb9m8mxnz9cf48sks0hib79b282iajl2nysyszph993yp0"; diff --git a/flake.lock b/flake.lock index 7470161..2f95a44 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", "type": "github" }, "original": { diff --git a/src/bluetooth/adapter.cpp b/src/bluetooth/adapter.cpp index 0d8a319..7f70a27 100644 --- a/src/bluetooth/adapter.cpp +++ b/src/bluetooth/adapter.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include "../core/logcat.hpp" diff --git a/src/bluetooth/device.cpp b/src/bluetooth/device.cpp index 7265b24..b140aa0 100644 --- a/src/bluetooth/device.cpp +++ b/src/bluetooth/device.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include diff --git a/src/core/scan.cpp b/src/core/scan.cpp index 9a7ee7e..453b7dc 100644 --- a/src/core/scan.cpp +++ b/src/core/scan.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include "logcat.hpp" diff --git a/src/debug/lint.cpp b/src/debug/lint.cpp index dd65a28..5e12f76 100644 --- a/src/debug/lint.cpp +++ b/src/debug/lint.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include "../core/logcat.hpp" diff --git a/src/io/ipccomm.cpp b/src/io/ipccomm.cpp index 7203a30..6c7e4f6 100644 --- a/src/io/ipccomm.cpp +++ b/src/io/ipccomm.cpp @@ -1,5 +1,4 @@ #include "ipccomm.hpp" -#include #include #include diff --git a/src/launch/command.cpp b/src/launch/command.cpp index 94fe239..1a58cb8 100644 --- a/src/launch/command.cpp +++ b/src/launch/command.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include diff --git a/src/network/device.cpp b/src/network/device.cpp index a47a5ee..22e3949 100644 --- a/src/network/device.cpp +++ b/src/network/device.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include "../core/logcat.hpp" diff --git a/src/network/network.cpp b/src/network/network.cpp index 67ed6a5..e325b05 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include "../core/logcat.hpp" diff --git a/src/network/wifi.cpp b/src/network/wifi.cpp index dcd20f6..57fb8ea 100644 --- a/src/network/wifi.cpp +++ b/src/network/wifi.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "../core/logcat.hpp" #include "device.hpp" diff --git a/src/services/pam/conversation.cpp b/src/services/pam/conversation.cpp index a9d498b..f8f5a09 100644 --- a/src/services/pam/conversation.cpp +++ b/src/services/pam/conversation.cpp @@ -1,5 +1,4 @@ #include "conversation.hpp" -#include #include #include diff --git a/src/services/pipewire/node.cpp b/src/services/pipewire/node.cpp index 1b396af..b6f0529 100644 --- a/src/services/pipewire/node.cpp +++ b/src/services/pipewire/node.cpp @@ -90,8 +90,6 @@ QString PwAudioChannel::toString(Enum value) { QString PwNodeType::toString(PwNodeType::Flags type) { switch (type) { - // qstringliteral apparently not imported... - // NOLINTBEGIN case PwNodeType::VideoSource: return QStringLiteral("VideoSource"); case PwNodeType::VideoSink: return QStringLiteral("VideoSink"); case PwNodeType::AudioSource: return QStringLiteral("AudioSource"); @@ -101,7 +99,6 @@ QString PwNodeType::toString(PwNodeType::Flags type) { case PwNodeType::AudioInStream: return QStringLiteral("AudioInStream"); case PwNodeType::Untracked: return QStringLiteral("Untracked"); default: return QStringLiteral("Invalid"); - // NOLINTEND } } diff --git a/src/services/polkit/listener.cpp b/src/services/polkit/listener.cpp index 875cff6..e4bca4c 100644 --- a/src/services/polkit/listener.cpp +++ b/src/services/polkit/listener.cpp @@ -1,6 +1,4 @@ #include "listener.hpp" -#include -#include #include #include #include diff --git a/src/services/status_notifier/item.cpp b/src/services/status_notifier/item.cpp index 650c812..17404e1 100644 --- a/src/services/status_notifier/item.cpp +++ b/src/services/status_notifier/item.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include diff --git a/src/services/upower/powerprofiles.cpp b/src/services/upower/powerprofiles.cpp index 8fa91cc..f59b871 100644 --- a/src/services/upower/powerprofiles.cpp +++ b/src/services/upower/powerprofiles.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include "../../core/logcat.hpp" #include "../../dbus/bus.hpp" diff --git a/src/wayland/buffer/dmabuf.cpp b/src/wayland/buffer/dmabuf.cpp index a5f219e..e51a1d0 100644 --- a/src/wayland/buffer/dmabuf.cpp +++ b/src/wayland/buffer/dmabuf.cpp @@ -1,7 +1,6 @@ #include "dmabuf.hpp" #include #include -#include #include #include #include diff --git a/src/wayland/hyprland/surface/surface.cpp b/src/wayland/hyprland/surface/surface.cpp index f49ab8f..774acd0 100644 --- a/src/wayland/hyprland/surface/surface.cpp +++ b/src/wayland/hyprland/surface/surface.cpp @@ -1,5 +1,4 @@ #include "surface.hpp" -#include #include #include diff --git a/src/window/popupwindow.cpp b/src/window/popupwindow.cpp index 0b35948..bfe261e 100644 --- a/src/window/popupwindow.cpp +++ b/src/window/popupwindow.cpp @@ -3,6 +3,7 @@ #include #include #include +#include #include #include