From f3a5f81fa02b6377c1d5132f2e817184b31ebd80 Mon Sep 17 00:00:00 2001
From: nerix <nerixdev@outlook.de>
Date: Tue, 5 Nov 2024 22:11:14 +0100
Subject: [PATCH] deps: use upstream qtkeychain (#5697)

---
 .gitmodules                | 1 -
 CHANGELOG.md               | 2 +-
 CMakeLists.txt             | 9 +++++++++
 lib/qtkeychain             | 2 +-
 src/common/Credentials.cpp | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 36f795b8b..219a91bfa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,7 +20,6 @@
 [submodule "lib/qtkeychain"]
 	path = lib/qtkeychain
 	url = https://github.com/Chatterino/qtkeychain
-	branch = chatterino-cmake
 [submodule "lib/websocketpp"]
 	path = lib/websocketpp
 	url = https://github.com/zaphoyd/websocketpp
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e087eeef6..ca72b9ab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -120,7 +120,7 @@
 - Dev: Emojis now use flags instead of a set of strings for capabilities. (#5616)
 - Dev: Move plugins to Sol2. (#5622, #5682)
 - 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: Decoupled reply parsing from `MessageBuilder`. (#5660, #5668)
 - Dev: Refactored IRC message building. (#5663)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 603c9c42b..37c8835b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,10 +160,19 @@ if (BUILD_WITH_QTKEYCHAIN)
             message(FATAL_ERROR "Submodules probably not loaded, unable to find lib/qtkeychain/CMakeLists.txt")
         endif()
 
+        set(_prev_testing ${BUILD_TESTING})
+        set(BUILD_TESTING Off)
         add_subdirectory("${QTKEYCHAIN_ROOT_LIB_FOLDER}" EXCLUDE_FROM_ALL)
+        set(BUILD_TESTING ${_prev_testing})
+
         if (NOT TARGET qt${MAJOR_QT_VERSION}keychain)
             message(FATAL_ERROR "qt${MAJOR_QT_VERSION}keychain target was not created :@")
         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()
 
diff --git a/lib/qtkeychain b/lib/qtkeychain
index e5b070831..73c3772d6 160000
--- a/lib/qtkeychain
+++ b/lib/qtkeychain
@@ -1 +1 @@
-Subproject commit e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6
+Subproject commit 73c3772d6432280df83e1ab3299c2a8f1e4ea47f
diff --git a/src/common/Credentials.cpp b/src/common/Credentials.cpp
index 1effa8f9b..7e5e5655e 100644
--- a/src/common/Credentials.cpp
+++ b/src/common/Credentials.cpp
@@ -24,7 +24,7 @@
 #            include "qt5keychain/keychain.h"
 #        endif
 #    else
-#        include "keychain.h"
+#        include <qtkeychain/keychain.h>
 #    endif
 #endif