summaryrefslogblamecommitdiff
path: root/user/kleopatra/qt5.9.patch
blob: b6f182029e2d09f262be643758e4b274e8e1035b (plain) (tree)


































































                                                                                                           
                              
                              

                              
                                  



                                                     










                                                                                                                  
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.60.0")
+set(KF5_MIN_VERSION "5.54.0")
 set(KMIME_VERSION "5.12.1")
 set(LIBKLEO_VERSION "5.12.1")
-set(QT_REQUIRED_VERSION "5.11.0")
+set(QT_REQUIRED_VERSION "5.9.0")
 set(GPGME_REQUIRED_VERSION "1.8.0")
 
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
--- kleopatra-19.08.0/CMakeLists.txt.old	2019-08-15 15:07:20.717152888 +0000
+++ kleopatra-19.08.0/CMakeLists.txt	2019-08-15 15:09:48.141370261 +0000
@@ -143,7 +143,7 @@
     add_subdirectory(tests)
     add_subdirectory(autotests)
 endif()
-install(FILES kleopatra.renamecategories kleopatra.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+#install(FILES kleopatra.renamecategories kleopatra.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 
 if(KF5DocTools_FOUND)
     add_subdirectory(doc)