change to qt6keychain

Mudlet · Apr 26, 2024 · 78f15d2 · 78f15d2
1 parent e1a6cef
commit 78f15d2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CI/setup-windows-sdk.sh b/CI/setup-windows-sdk.sh
@@ -144,7 +144,6 @@ if [ "${LEVEL}" = "full" ]; then
     /usr/bin/pacman -S --needed --noconfirm --noprogressbar mingw-w64-${BUILDCOMPONENT}-qt6-speech
     /usr/bin/pacman -S --needed --noconfirm --noprogressbar mingw-w64-${BUILDCOMPONENT}-qt6-imageformats
     /usr/bin/pacman -S --needed --noconfirm --noprogressbar mingw-w64-${BUILDCOMPONENT}-qt6-tools
-    /usr/bin/pacman -S --needed --noconfirm --noprogressbar mingw-w64-${BUILDCOMPONENT}-qt6-5compat
     /usr/bin/pacman -S --needed --noconfirm --noprogressbar mingw-w64-${BUILDCOMPONENT}-pcre
     /usr/bin/pacman -S --needed --noconfirm --noprogressbar mingw-w64-${BUILDCOMPONENT}-libzip
     /usr/bin/pacman -S --needed --noconfirm --noprogressbar mingw-w64-${BUILDCOMPONENT}-ntldd
@@ -169,11 +168,11 @@ if [ "${MSYSTEM}" = "MINGW64" ]; then
     # Qt creator is only available to be run in a MINGW64 environment but it
     # can be used to run the MINGW32 components - which are needed to do that
     /usr/bin/pacman -S --needed --noconfirm \
-      "mingw-w64-${BUILDCOMPONENT}-qtkeychain-qt5" \
+      "mingw-w64-${BUILDCOMPONENT}-qtkeychain-qt6" \
       "mingw-w64-${BUILDCOMPONENT}-qt-creator"
   else
     /usr/bin/pacman -S --needed --noconfirm \
-      "mingw-w64-${BUILDCOMPONENT}-qtkeychain-qt5"
+      "mingw-w64-${BUILDCOMPONENT}-qtkeychain-qt6"
   fi
   echo "    Completed"
 else

diff --git a/src/mudlet.h b/src/mudlet.h
@@ -59,7 +59,11 @@
 #if defined(INCLUDE_OWN_QT5_KEYCHAIN)
 #include <../3rdparty/qtkeychain/keychain.h>
 #else
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <qt5keychain/keychain.h>
+#else
+#include <qt6keychain/keychain.h>
+#endif
 #endif
 #include <optional>
 #include <hunspell/hunspell.hxx>

diff --git a/src/mudlet.pro b/src/mudlet.pro
@@ -982,7 +982,7 @@ contains( DEFINES, "INCLUDE_OWN_QT5_KEYCHAIN" ) {
         message("Including own copy of QtKeyChain library code in this configuration")
     }
 } else {
-    LIBS += -lqt5keychain
+    LIBS += -lqt6keychain
     !build_pass{
         message("Linking with system QtKeyChain library code in this configuration")
     }