From 973c8116c840b4f1e0c3c80a7956641550c3388d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Tue, 8 Sep 2020 15:37:11 +0200 Subject: [PATCH] qt: Update the documentation of ListAllKeysJob * lang/qt/src/listallkeysjob.h (ListAllKeysJob::start): Document that the mergeKeys argument is ignored with gpg >= 2.1. -- GnuPG-bug-id: 4794 --- lang/qt/src/listallkeysjob.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/qt/src/listallkeysjob.h b/lang/qt/src/listallkeysjob.h index ebbdc16f..85cd04b1 100644 --- a/lang/qt/src/listallkeysjob.h +++ b/lang/qt/src/listallkeysjob.h @@ -86,8 +86,9 @@ public: and should do so; when this happens, it will be reported by the result object). - If \a mergeKeys is true, secret keys are merged into public - keys. + If GnuPG 2.1 or later is used, then \a mergeKeys is ignored. Otherwise, + if \a mergeKeys is true, then some (but not all) information of the + secret keys is merged into public keys. */ virtual GpgME::Error start(bool mergeKeys = false) = 0;