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

Fix qtkeychain include for Qt6 users (#4863)

Browse source
This commit is contained in:
pajlada 2023-10-03 17:59:34 +02:00 committed by GitHub
parent 131812b37b
commit 38a7ce6954
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -29,6 +29,7 @@
- Dev: Clarify signal connection lifetimes where applicable. (#4818)
- Dev: Laid the groundwork for advanced input completion strategies. (#4639, #4846, #4853)
- Dev: Fixed flickering when running with Direct2D on Windows. (#4851)
- Dev: Fix qtkeychain include for Qt6 users. (#4863)
- Dev: Add a compile-time flag `CHATTERINO_UPDATER` which can be turned off to disable update checks. (#4854)
## 2.4.6

6
src/common/Credentials.cpp
View file

@ -11,7 +11,11 @@
#ifndef NO_QTKEYCHAIN
# ifdef CMAKE_BUILD
# include "qt5keychain/keychain.h"
# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
# include "qt6keychain/keychain.h"
# else
# include "qt5keychain/keychain.h"
# endif
# else
# include "keychain.h"
# endif