summary refs log tree commit diff
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2020-12-29 08:57:34 +0100
committerGitHub <noreply@github.com>2020-12-29 08:57:34 +0100
commitcaaa8323191f089ac3de66e71fa6928296401d8a (patch)
tree5407ad44c4d542827c116f71d5dd07bdeb9a09a0
parentMerge branch 'ci-cleanups-and-experiments' into 'master' (diff)
parentFix missing include on Windows (diff)
downloadnheko-caaa8323191f089ac3de66e71fa6928296401d8a.tar.xz
Merge pull request #361 from Nheko-Reborn/keychain-in-flatpak
Link keychain in flatpak statically
-rw-r--r--io.github.NhekoReborn.Nheko.json3
-rw-r--r--src/UserSettingsPage.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/io.github.NhekoReborn.Nheko.json b/io.github.NhekoReborn.Nheko.json

index 34b0d7e7..352ca648 100644 --- a/io.github.NhekoReborn.Nheko.json +++ b/io.github.NhekoReborn.Nheko.json
@@ -97,7 +97,8 @@ { "config-opts": [ "-DCMAKE_BUILD_TYPE=Release", - "-DBUILD_TEST_APPLICATION=OFF" + "-DBUILD_TEST_APPLICATION=OFF", + "-DQTKEYCHAIN_STATIC=ON" ], "buildsystem": "cmake-ninja", "name": "QtKeychain", diff --git a/src/UserSettingsPage.h b/src/UserSettingsPage.h
index af73202e..6744d101 100644 --- a/src/UserSettingsPage.h +++ b/src/UserSettingsPage.h
@@ -23,6 +23,8 @@ #include <QSharedPointer> #include <QWidget> +#include <optional> + class Toggle; class QLabel; class QFormLayout;