From b0332a317093f18bd1a96cdc8c9be51afae61163 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Mon, 28 Oct 2024 18:50:14 +0300
Subject: [PATCH] Current version of Psi+ is 1.5.2067

It is based on:
* psi: 0d08d3d0
* plugins: 347230b
* psimedia: 478567e
* resources: fc4cfc1
---
 src/accountmodifydlg.cpp | 4 ++++
 src/common.cpp           | 4 ++++
 src/psiaccount.cpp       | 4 ++++
 version                  | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/accountmodifydlg.cpp b/src/accountmodifydlg.cpp
index 996c05bf3..7f2643273 100644
--- 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
index e6680f357..6c6d044cb 100644
--- 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
index 80650f14d..a1bede783 100644
--- 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
index 1ea457790..397780e0f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.5.2066 (2024-10-27, 53cf9ecb)
+1.5.2067 (2024-10-28, 0d08d3d0)