fix: qt5 build issues

5 files changed, 26 insertions, 6 deletions

diff --git a/src/core/function/gpg/GpgSmartCardManager.cpp b/src/core/function/gpg/GpgSmartCardManager.cpp
index cc7f8ab3..5442ea88 100644
--- a/src/core/function/gpg/GpgSmartCardManager.cpp
+++ b/src/core/function/gpg/GpgSmartCardManager.cpp
@@ -107,7 +107,7 @@ auto GpgSmartCardManager::GetSerialNumbers() -> QStringList {
           .toHex();
   // check and skip
   if (cached_scd_serialno_status_hash_ == hash) {
-    return cache_scd_card_serial_numbers_;
+    return QCS2QSL(cache_scd_card_serial_numbers_);
   }
 
   cached_scd_serialno_status_hash_.clear();
@@ -138,7 +138,7 @@ auto GpgSmartCardManager::GetSerialNumbers() -> QStringList {
   }
 
   cached_scd_serialno_status_hash_ = hash;
-  return cache_scd_card_serial_numbers_;
+  return QCS2QSL(cache_scd_card_serial_numbers_);
 }
 
 auto GpgSmartCardManager::SelectCardBySerialNumber(const QString& serial_number)
diff --git a/src/core/model/GpgKeyTableModel.cpp b/src/core/model/GpgKeyTableModel.cpp
index d5de3844..0938fbe0 100644
--- a/src/core/model/GpgKeyTableModel.cpp
+++ b/src/core/model/GpgKeyTableModel.cpp
@@ -53,7 +53,14 @@ GpgKeyTableModel::GpgKeyTableModel(int channel,
 auto GpgKeyTableModel::index(int row, int column,
                              const QModelIndex &parent) const -> QModelIndex {
   if (!hasIndex(row, column, parent) || parent.isValid()) return {};
-  return createIndex(row, column, &cached_items_[row]);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+  return createIndex(row, column,
+                     static_cast<const void *>(&cached_items_[row]));
+#else
+  return createIndex(
+      row, column,
+      const_cast<void *>(static_cast<const void *>(&cached_items_[row])));
+#endif
 }
 
 auto GpgKeyTableModel::rowCount(const QModelIndex & /*parent*/) const -> int {
diff --git a/src/core/model/GpgOpenPGPCard.cpp b/src/core/model/GpgOpenPGPCard.cpp
index ddc9a40e..8066f819 100644
--- a/src/core/model/GpgOpenPGPCard.cpp
+++ b/src/core/model/GpgOpenPGPCard.cpp
@@ -66,7 +66,7 @@ void GpgFrontend::GpgOpenPGPCard::parse_card_info(const QString& name,
     additional_card_infos.insert(name, value);
   }
 
-  reader = additional_card_infos.value("READER").replace('+', ' ');
+  reader = QString(additional_card_infos.value("READER")).replace("+", " ");
   serial_number = additional_card_infos.value("SERIALNO");
   app_type = additional_card_infos.value("APPTYPE");
   display_language = additional_card_infos.value("DISP-LANG");
@@ -177,8 +177,13 @@ void GpgOpenPGPCard::parse_card_key_info(const QString& name,
     if (tokens.size() >= 2) {
       int no = tokens.front().toInt();
       qint64 ts = tokens.back().toLongLong();
-      card_keys_info[no].created =
-          QDateTime::fromSecsSinceEpoch(ts, QTimeZone::UTC);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+      auto dt = QDateTime::fromSecsSinceEpoch(ts, QTimeZone::UTC);
+#else
+      auto dt = QDateTime::fromSecsSinceEpoch(ts, QTimeZone::utc());
+#endif
+      card_keys_info[no].created = dt;
     }
   } else if (name == "KEYPAIRINFO") {
     auto tokens = value.split(' ');
diff --git a/src/core/typedef/CoreTypedef.h b/src/core/typedef/CoreTypedef.h
index 3f7e4021..57f3c40b 100644
--- a/src/core/typedef/CoreTypedef.h
+++ b/src/core/typedef/CoreTypedef.h
@@ -45,4 +45,11 @@ using BypeArrayConstRef = const ByteArray&;  ///<
 using StringArgsPtr = QStringList;           ///<
 using StringArgsRef = QStringList&;          ///<
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#define QCS2QSL(vec) (QStringList(vec.begin(), vec.end()))
+#else
+template <typename T>
+#define QCS2QSL(vec) (vec)
+#endif
+
 }  // namespace GpgFrontend
\ No newline at end of file
diff --git a/src/ui/dialog/import_export/KeyServerImportDialog.cpp b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
index 37ca5a3d..60debabd 100644
--- a/src/ui/dialog/import_export/KeyServerImportDialog.cpp
+++ b/src/ui/dialog/import_export/KeyServerImportDialog.cpp
@@ -30,6 +30,7 @@
 
 #include "core/function/GlobalSettingStation.h"
 #include "core/function/gpg/GpgKeyImportExporter.h"
+#include "core/model/GpgImportInformation.h"
 #include "core/model/SettingsObject.h"
 #include "ui/UISignalStation.h"
 #include "ui/struct/settings_object/KeyServerSO.h"