noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

added qtkeychain dependency

Browse source
This commit is contained in:
fourtf 2019-09-09 22:18:56 +02:00
parent cf23838099
commit 8241ce7097
5 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -26,3 +26,6 @@
[submodule "lib/rapidjson"] [submodule "lib/rapidjson"]
path = lib/rapidjson path = lib/rapidjson
url = https://github.com/Tencent/rapidjson url = https://github.com/Tencent/rapidjson
[submodule "lib/qtkeychain"]
path = lib/qtkeychain
url = https://github.com/frankosterfeld/qtkeychain

3
chatterino.pro
View file

@ -54,6 +54,7 @@ include(lib/settings.pri)
include(lib/serialize.pri) include(lib/serialize.pri)
include(lib/winsdk.pri) include(lib/winsdk.pri)
include(lib/rapidjson.pri) include(lib/rapidjson.pri)
include(lib/qtkeychain.pri)
exists( $$OUT_PWD/conanbuildinfo.pri ) { exists( $$OUT_PWD/conanbuildinfo.pri ) {
message("Using conan packages") message("Using conan packages")
@ -79,6 +80,7 @@ SOURCES += \
src/BrowserExtension.cpp \ src/BrowserExtension.cpp \
src/common/Channel.cpp \ src/common/Channel.cpp \
src/common/CompletionModel.cpp \ src/common/CompletionModel.cpp \
src/common/Credentials.cpp \
src/common/DownloadManager.cpp \ src/common/DownloadManager.cpp \
src/common/Env.cpp \ src/common/Env.cpp \
src/common/LinkParser.cpp \ src/common/LinkParser.cpp \
@ -233,6 +235,7 @@ HEADERS += \
src/common/Common.hpp \ src/common/Common.hpp \
src/common/CompletionModel.hpp \ src/common/CompletionModel.hpp \
src/common/ConcurrentMap.hpp \ src/common/ConcurrentMap.hpp \
src/common/Credentials.hpp \
src/common/DownloadManager.hpp \ src/common/DownloadManager.hpp \
src/common/Env.hpp \ src/common/Env.hpp \
src/common/LinkParser.hpp \ src/common/LinkParser.hpp \

1
lib/qtkeychain.pri Normal file
View file

@ -0,0 +1 @@
include(qtkeychain/qt5keychain.pri)

1
resources/resources_autogenerated.qrc
View file

@ -46,6 +46,7 @@
<file>licenses/pajlada_settings.txt</file> <file>licenses/pajlada_settings.txt</file>
<file>licenses/pajlada_signals.txt</file> <file>licenses/pajlada_signals.txt</file>
<file>licenses/qt_lgpl-3.0.txt</file> <file>licenses/qt_lgpl-3.0.txt</file>
<file>licenses/qtkeychain.txt</file>
<file>licenses/rapidjson.txt</file> <file>licenses/rapidjson.txt</file>
<file>licenses/websocketpp.txt</file> <file>licenses/websocketpp.txt</file>
<file>pajaDank.png</file> <file>pajaDank.png</file>

3
src/widgets/settingspages/AboutPage.cpp
View file

@ -98,6 +98,9 @@ AboutPage::AboutPage()
addLicense(form.getElement(), "Websocketpp", addLicense(form.getElement(), "Websocketpp",
"https://www.zaphoyd.com/websocketpp/", "https://www.zaphoyd.com/websocketpp/",
":/licenses/websocketpp.txt"); ":/licenses/websocketpp.txt");
addLicense(form.getElement(), "QtKeychain",
"https://github.com/frankosterfeld/qtkeychain",
":/licenses/qtkeychain.txt");
} }
auto attributions = layout.emplace<QGroupBox>("Attributions..."); auto attributions = layout.emplace<QGroupBox>("Attributions...");