diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93bfa439..8a4c22d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,8 +136,8 @@ build-flatpak-amd64: before_script: - apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0 - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08 - - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08 + - flatpak --noninteractive install --user flathub org.kde.Platform//6.2 + - flatpak --noninteractive install --user flathub org.kde.Sdk//6.2 script: - export VERSION=$(git describe) - mkdir -p build-flatpak @@ -164,8 +164,8 @@ build-flatpak-arm64: before_script: - apt-get update && apt-get -y install flatpak-builder git python3 curl python3-aiohttp python3-tenacity gir1.2-ostree-1.0 - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - - flatpak --noninteractive install --user flathub org.kde.Platform//5.15-21.08 - - flatpak --noninteractive install --user flathub org.kde.Sdk//5.15-21.08 + - flatpak --noninteractive install --user flathub org.kde.Platform//6.2 + - flatpak --noninteractive install --user flathub org.kde.Sdk//6.2 script: - export VERSION=$(git describe) - mkdir -p build-flatpak diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml index ac16be72..2268ef61 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml @@ -1,7 +1,7 @@ id: io.github.NhekoReborn.Nheko command: nheko runtime: org.kde.Platform -runtime-version: '5.15-21.08' +runtime-version: '6.2' sdk: org.kde.Sdk finish-args: - --device=dri @@ -105,12 +105,13 @@ modules: - config-opts: - -DCMAKE_BUILD_TYPE=Release - -DBUILD_TEST_APPLICATION=OFF - - -DQTKEYCHAIN_STATIC=ON + - -DBUILD_WITH_QT6=ON + - -DBUILD_SHARED_LIBS=OFF buildsystem: cmake-ninja name: QtKeychain sources: - - commit: f59ac26be709fd2d8d7a062fab1cf1e67a93806c - tag: v0.13.1 + - commit: c236f9241e37f1754879cf8726d59351a2b2b24a + tag: v0.13.2 type: git url: https://github.com/frankosterfeld/qtkeychain.git - config-opts: diff --git a/src/Cache.cpp b/src/Cache.cpp index db71a133..19775f04 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -20,7 +20,7 @@ #if __has_include() #include #else -#include +#include #endif #include