Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update qtkeychain to e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6 #4250

Merged
merged 3 commits into from
Dec 20, 2022
Merged

Update qtkeychain to e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6 #4250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0eb5930
Update qtkeychain to `e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6`
pajlada Dec 20, 2022
6bddcf8
FreeBSD/Cirrus - use system qtkeychain
pajlada Dec 20, 2022
8db1560
Set BUILD_SHARED_LIBS to OFF globally
pajlada Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ task:
git submodule update
mkdir build
cd build
cmake CMAKE_C_COMPILER="cc" -DCMAKE_CXX_COMPILER="c++" -DCMAKE_C_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DLINK_OPTIONS="-fstack-protector-strong" -DCMAKE_INSTALL_PREFIX="/usr/local" -DCMAKE_BUILD_TYPE="release" ..
cmake CMAKE_C_COMPILER="cc" -DCMAKE_CXX_COMPILER="c++" -DCMAKE_C_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DLINK_OPTIONS="-fstack-protector-strong" -DCMAKE_INSTALL_PREFIX="/usr/local" -DUSE_SYSTEM_QTKEYCHAIN="ON" -DCMAKE_BUILD_TYPE="release" ..
make -j $(getconf _NPROCESSORS_ONLN)
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ option(BUILD_WITH_QTKEYCHAIN "Build Chatterino with support for your system key
option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
option(BUILD_WITH_QT6 "Use Qt6 instead of default Qt5" OFF)
option(CHATTERINO_GENERATE_COVERAGE "Generate coverage files" OFF)
option(BUILD_SHARED_LIBS "" OFF)

option(USE_CONAN "Use conan" OFF)

Expand Down Expand Up @@ -84,7 +85,6 @@ endif()

if (BUILD_WITH_QTKEYCHAIN)
# Link QtKeychain statically
option(QTKEYCHAIN_STATIC "" ON)
if (USE_SYSTEM_QTKEYCHAIN)
find_package(Qt${MAJOR_QT_VERSION}Keychain REQUIRED)
else()
Expand Down
2 changes: 1 addition & 1 deletion lib/qtkeychain
Open in desktop
Submodule qtkeychain updated 30 files
+74 −3 .gitignore
+51 −41 CMakeLists.txt
+14 −0 ChangeLog
+10 −1 QtKeychainConfig.cmake.in
+0 −6 ReadMe.md
+73 −0 TestAppExample/.gitignore
+29 −0 TestAppExample/TestAppExample.pro
+61 −0 TestAppExample/keychainclass.cpp
+30 −0 TestAppExample/keychainclass.h
+29 −0 TestAppExample/main.cpp
+131 −0 TestAppExample/main.qml
+5 −0 TestAppExample/qml.qrc
+3 −1 androidkeystore.cpp
+13 −2 androidkeystore_p.h
+159 −102 cmake/Modules/ECMGeneratePriFile.cmake
+0 −46 cmake/Modules/ECMQueryQmake.cmake
+100 −0 cmake/Modules/ECMQueryQt.cmake
+0 −188 cmake/Modules/GNUInstallDirs.cmake
+36 −0 cmake/Modules/QtVersionOption.cmake
+1 −1 gnomekeyring.cpp
+6 −0 keychain_android.cpp
+1 −1 keychain_apple.mm
+2 −2 keychain_haiku.cpp
+2 −2 keychain_p.h
+9 −5 keychain_unix.cpp
+7 −7 keychain_win.cpp
+31 −35 libsecret.cpp
+3 −3 org.kde.KWallet.xml
+5 −8 qtkeychain.pri
+5 −0 translations/translations.qrc.in