Current version of Psi+ is 1.5.2067

It is based on: * psi: 0d08d3d0 * plugins: 347230b * psimedia: 478567e * resources: fc4cfc1
psi-plus · Oct 28, 2024 · b0332a3 · b0332a3
1 parent d182efe
commit b0332a3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/accountmodifydlg.cpp b/src/accountmodifydlg.cpp
@@ -31,7 +31,11 @@
 #include "psicontactlist.h"
 #include "psioptions.h"
 #ifdef HAVE_KEYCHAIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <qt5keychain/keychain.h>
+#else
+#include <qt6keychain/keychain.h>
+#endif
 #endif
 
 #include <QInputDialog>

diff --git a/src/common.cpp b/src/common.cpp
@@ -51,7 +51,11 @@
 #include <langinfo.h>
 #endif
 #ifdef HAVE_KEYCHAIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <qt5keychain/keychain.h>
+#else
+#include <qt6keychain/keychain.h>
+#endif
 #endif
 // #include <stdio.h>
 #ifdef Q_OS_MAC

diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp
@@ -158,7 +158,11 @@
 #include <QtCrypto>
 #include <qca.h>
 #ifdef HAVE_KEYCHAIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <qt5keychain/keychain.h>
+#else
+#include <qt6keychain/keychain.h>
+#endif
 #endif
 
 #include <optional>

diff --git a/version b/version
@@ -1 +1 @@
-1.5.2066 (2024-10-27, 53cf9ecb)
+1.5.2067 (2024-10-28, 0d08d3d0)