summaryrefslogtreecommitdiff
path: root/user/kleopatra/qt5.9.patch
blob: 25392c9f25fcd9b8e7c94a6ca74b95f7a3b5d0fc (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
From e3a467d6221d15015ccd5166d6dc53335482c5c8 Mon Sep 17 00:00:00 2001
Date: Mon, 17 Dec 2018 08:12:46 +0100
Subject: Revert "Remove QT_CHECK"

---
 src/commands/certifycertificatecommand.cpp | 4 ++++
 src/commands/importcertificatescommand.cpp | 4 ++++
 src/dialogs/certificateselectiondialog.cpp | 4 ++++
 3 files changed, 12 additions(+)

diff --git a/src/commands/certifycertificatecommand.cpp b/src/commands/certifycertificatecommand.cpp
index 524b5a6..5577f2f 100644
--- a/src/commands/certifycertificatecommand.cpp
+++ b/src/commands/certifycertificatecommand.cpp
@@ -215,7 +215,11 @@ void CertifyCertificateCommand::doStart()
             cmd->setParentWidget(d->parentWidgetOrView());
             cmd->setProtocol(GpgME::OpenPGP);
             loop.connect(cmd, SIGNAL(finished()), SLOT(quit()));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
             QMetaObject::invokeMethod(cmd, &Commands::NewCertificateCommand::start, Qt::QueuedConnection);
+#else
+            QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection);
+#endif
             loop.exec();
         } else {
             Q_EMIT(canceled());
diff --git a/src/commands/importcertificatescommand.cpp b/src/commands/importcertificatescommand.cpp
index 49294b6..89542cc 100644
--- a/src/commands/importcertificatescommand.cpp
+++ b/src/commands/importcertificatescommand.cpp
@@ -392,7 +392,11 @@ bool ImportCertificatesCommand::Private::showPleaseCertify(const GpgME::Import &
         auto cmd = new Commands::CertifyCertificateCommand(key);
         cmd->setParentWidget(parentWidgetOrView());
         loop.connect(cmd, SIGNAL(finished()), SLOT(quit()));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
         QMetaObject::invokeMethod(cmd, &Commands::CertifyCertificateCommand::start, Qt::QueuedConnection);
+#else
+        QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection);
+#endif
         loop.exec();
     }
     return true;
diff --git a/src/dialogs/certificateselectiondialog.cpp b/src/dialogs/certificateselectiondialog.cpp
index 003872e..020310d 100644
--- a/src/dialogs/certificateselectiondialog.cpp
+++ b/src/dialogs/certificateselectiondialog.cpp
@@ -384,7 +384,11 @@ void CertificateSelectionDialog::Private::slotDoubleClicked(const QModelIndex &i
     QItemSelectionModel *const sm = view->selectionModel();
     Q_ASSERT(sm);
     sm->select(idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
     QMetaObject::invokeMethod(q, [this]() {q->accept();}, Qt::QueuedConnection);
+#else
+    QMetaObject::invokeMethod(q, "accept", Qt::QueuedConnection);
+#endif
 }
 
 void CertificateSelectionDialog::accept()
-- 
cgit v1.1

--- kleopatra-19.04.0/CMakeLists.txt.old	2019-04-12 00:14:10.000000000 +0000
+++ kleopatra-19.04.0/CMakeLists.txt	2019-04-19 06:34:58.511578506 +0000
@@ -11,10 +11,10 @@
 option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
 
 # Standalone build. Find / include everything necessary.
-set(KF5_MIN_VERSION "5.56.0")
+set(KF5_MIN_VERSION "5.54.0")
 set(KMIME_VERSION "5.11.3")
 set(LIBKLEO_VERSION "5.11.3")
-set(QT_REQUIRED_VERSION "5.10.0")
+set(QT_REQUIRED_VERSION "5.9.0")
 set(GPGME_REQUIRED_VERSION "1.8.0")
 
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)