Allow for building without QtKeychain (#3318)

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
Mm2PL
2021-10-31 19:45:23 +00:00
committed by GitHub
parent 4b903d7fcf
commit fc4387014e
6 changed files with 44 additions and 19 deletions
+2
View File
@@ -140,9 +140,11 @@ AboutPage::AboutPage()
addLicense(form.getElement(), "Websocketpp",
"https://www.zaphoyd.com/websocketpp/",
":/licenses/websocketpp.txt");
#ifndef NO_QTKEYCHAIN
addLicense(form.getElement(), "QtKeychain",
"https://github.com/frankosterfeld/qtkeychain",
":/licenses/qtkeychain.txt");
#endif
addLicense(form.getElement(), "lrucache",
"https://github.com/lamerman/cpp-lru-cache",
":/licenses/lrucache.txt");
+1 -1
View File
@@ -584,7 +584,7 @@ void GeneralPage::initLayout(GeneralPageView &layout)
layout.addCheckbox("Restart on crash", s.restartOnCrash);
#ifdef Q_OS_LINUX
#if defined(Q_OS_LINUX) && !defined(NO_QTKEYCHAIN)
if (!getPaths()->isPortable())
{
layout.addCheckbox(