Find QtKeychain by its cmake target

strk · Feb 10, 2024 · b9e859f · b9e859f
1 parent 3a18496
commit b9e859f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 65 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -568,7 +568,11 @@ if(WITH_CORE)
   endif()
 
   # Password helper
-  find_package(QtKeychain REQUIRED)
+  if(BUILD_WITH_QT6)
+    find_package(Qt6Keychain CONFIG REQUIRED)
+  else()
+    find_package(Qt5Keychain CONFIG REQUIRED)
+  endif()
   # Master password hash and authentication encryption
   find_package(QCA REQUIRED)
   # Check for runtime dependency of qca-ossl plugin

diff --git a/cmake/FindQtKeychain.cmake b/cmake/FindQtKeychain.cmake
diff --git a/external/o2/src/o0keychainstore.cpp b/external/o2/src/o0keychainstore.cpp
@@ -4,7 +4,11 @@
 #include "o0keychainstore.h"
 
 #include <QDebug>
-#include <keychain.h>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <qt6keychain/keychain.h>
+#else
+#include <qt5keychain/keychain.h>
+#endif
 #include <QtCore/QDataStream>
 #include <QtCore/QBuffer>
 #include <QtCore/QEventLoop>
@@ -75,4 +79,4 @@ void o0keyChainStore::clearFromKeychain() {
     if ( job.error() ) {
         qWarning() << "Deleting keychain failed: " << qPrintable(job.errorString());
     }
-}
+}
diff --git a/src/auth/oauth2/CMakeLists.txt b/src/auth/oauth2/CMakeLists.txt
@@ -3,9 +3,6 @@
 ########################################################
 # Packages
 
-if(NOT QTKEYCHAIN_FOUND)
-  find_package(QtKeychain REQUIRED)
-endif()
 option(WITH_INTERNAL_O2 "Download and locally include source of o2 library" ON)
 
 if(WITH_INTERNAL_O2)

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -2249,7 +2249,6 @@ target_include_directories(qgis_core SYSTEM PUBLIC
   ${SPATIALINDEX_INCLUDE_DIR} # before GEOS for case-insensitive filesystems
   ${SQLITE3_INCLUDE_DIR}
   ${QCA_INCLUDE_DIR}
-  ${QTKEYCHAIN_INCLUDE_DIR}
   ${${QT_VERSION_BASE}SerialPort_INCLUDE_DIRS}
   ${Protobuf_INCLUDE_DIRS}
   ${ZLIB_INCLUDE_DIRS}
@@ -2411,7 +2410,6 @@ target_link_libraries(qgis_core
   ${QT_VERSION_BASE}::Concurrent
   ${OPTIONAL_QTWEBKIT}
   ${QCA_LIBRARY}
-  ${QTKEYCHAIN_LIBRARY}
   GEOS::geos_c
   GDAL::GDAL
   ${SPATIALINDEX_LIBRARY}
@@ -2424,6 +2422,16 @@ target_link_libraries(qgis_core
   PROJ::proj
 )
 
+if(BUILD_WITH_QT6)
+target_link_libraries(qgis_core
+  Qt6Keychain::Qt6Keychain
+)
+else()
+target_link_libraries(qgis_core
+  Qt5Keychain::Qt5Keychain
+)
+endif()
+
 if (WITH_QTPRINTER)
   target_link_libraries(qgis_core ${QT_VERSION_BASE}::PrintSupport)
   target_include_directories(qgis_core SYSTEM PUBLIC ${${QT_VERSION_BASE}PrintSupport_INCLUDE_DIRS})

diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -44,9 +44,6 @@
 #include <QSslConfiguration>
 #endif
 
-// QtKeyChain library
-#include "keychain.h"
-
 // QGIS includes
 #include "qgsauthcertutils.h"
 #include "qgsauthcrypto.h"

diff --git a/src/core/auth/qgsauthmanager.h b/src/core/auth/qgsauthmanager.h
@@ -38,8 +38,11 @@
 #include "qgsauthconfig.h"
 #include "qgsauthmethod.h"
 
-// Qt5KeyChain library
-#include "keychain.h"
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <qt6keychain/keychain.h>
+#else
+#include <qt5keychain/keychain.h>
+#endif
 
 #ifndef SIP_RUN
 namespace QCA