chatterino2
Code Issues

deps: use upstream qtkeychain (#5697)

Browse Source
This commit is contained in:
nerix
2024-11-05 22:11:14 +01:00
committed by GitHub
parent 46c1f18ae7
commit f3a5f81fa0
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
-1
View File
@@ -20,7 +20,6 @@
[submodule "lib/qtkeychain"] [submodule "lib/qtkeychain"]
path = lib/qtkeychain path = lib/qtkeychain
url = https://github.com/Chatterino/qtkeychain url = https://github.com/Chatterino/qtkeychain
branch = chatterino-cmake
[submodule "lib/websocketpp"] [submodule "lib/websocketpp"]
path = lib/websocketpp path = lib/websocketpp
url = https://github.com/zaphoyd/websocketpp url = https://github.com/zaphoyd/websocketpp
CHANGELOG.md
+1 -1
View File
@@ -120,7 +120,7 @@
- Dev: Emojis now use flags instead of a set of strings for capabilities. (#5616) - Dev: Emojis now use flags instead of a set of strings for capabilities. (#5616)
- Dev: Move plugins to Sol2. (#5622, #5682) - Dev: Move plugins to Sol2. (#5622, #5682)
- Dev: Clarified our Lua dependency's version. (#5693) - Dev: Clarified our Lua dependency's version. (#5693)
- Dev: Specified qtkeychain dependency version. (#5695) - Dev: Specified qtkeychain dependency version. (#5695, #5697)
- Dev: Refactored static `MessageBuilder` helpers to standalone functions. (#5652) - Dev: Refactored static `MessageBuilder` helpers to standalone functions. (#5652)
- Dev: Decoupled reply parsing from `MessageBuilder`. (#5660, #5668) - Dev: Decoupled reply parsing from `MessageBuilder`. (#5660, #5668)
- Dev: Refactored IRC message building. (#5663) - Dev: Refactored IRC message building. (#5663)
CMakeLists.txt
+9
View File
@@ -160,10 +160,19 @@ if (BUILD_WITH_QTKEYCHAIN)
message(FATAL_ERROR "Submodules probably not loaded, unable to find lib/qtkeychain/CMakeLists.txt") message(FATAL_ERROR "Submodules probably not loaded, unable to find lib/qtkeychain/CMakeLists.txt")
endif() endif()
set(_prev_testing ${BUILD_TESTING})
set(BUILD_TESTING Off)
add_subdirectory("${QTKEYCHAIN_ROOT_LIB_FOLDER}" EXCLUDE_FROM_ALL) add_subdirectory("${QTKEYCHAIN_ROOT_LIB_FOLDER}" EXCLUDE_FROM_ALL)
set(BUILD_TESTING ${_prev_testing})
if (NOT TARGET qt${MAJOR_QT_VERSION}keychain) if (NOT TARGET qt${MAJOR_QT_VERSION}keychain)
message(FATAL_ERROR "qt${MAJOR_QT_VERSION}keychain target was not created :@") message(FATAL_ERROR "qt${MAJOR_QT_VERSION}keychain target was not created :@")
endif() endif()
if (MSVC AND "${MAJOR_QT_VERSION}" STREQUAL "5")
target_compile_definitions(qt5keychain PRIVATE UNICODE)
target_compile_options(qt5keychain PRIVATE /utf-8)
set_target_properties(qt5keychain PROPERTIES CXX_STANDARD 17)
endif()
endif() endif()
endif() endif()
lib/qtkeychain
+1 -1
Submodule lib/qtkeychain updated: e5b070831c...73c3772d64
src/common/Credentials.cpp
+1 -1
View File
@@ -24,7 +24,7 @@
# include "qt5keychain/keychain.h" # include "qt5keychain/keychain.h"
# endif # endif
# else # else
# include "keychain.h" # include <qtkeychain/keychain.h>
# endif # endif
#endif #endif