aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Klöcker <[email protected]>2020-09-08 13:37:11 +0000
committerIngo Klöcker <[email protected]>2020-09-08 13:38:00 +0000
commit973c8116c840b4f1e0c3c80a7956641550c3388d (patch)
treefc61cbd6c568f630f526456972db38c988c58c6d
parentcpp: Update key with --with-secret instead of updating it twice (diff)
downloadgpgme-973c8116c840b4f1e0c3c80a7956641550c3388d.tar.gz
gpgme-973c8116c840b4f1e0c3c80a7956641550c3388d.zip
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
-rw-r--r--lang/qt/src/listallkeysjob.h5
1 files 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;