diff --git a/lang/qt/src/defaultkeygenerationjob.h b/lang/qt/src/defaultkeygenerationjob.h
index fcefc4b9..0bc7b610 100644
--- a/lang/qt/src/defaultkeygenerationjob.h
+++ b/lang/qt/src/defaultkeygenerationjob.h
@@ -54,19 +54,19 @@ public:
 
     GpgME::Error start(const QString &email, const QString &name);
 
-    QString auditLogAsHtml() const Q_DECL_OVERRIDE;
-    GpgME::Error auditLogError() const Q_DECL_OVERRIDE;
+    QString auditLogAsHtml() const override;
+    GpgME::Error auditLogError() const override;
 
 
 public Q_SLOTS:
-    void slotCancel() Q_DECL_OVERRIDE;
+    void slotCancel() override;
 
 Q_SIGNALS:
     void result(const GpgME::KeyGenerationResult &result, const QByteArray &pubkeyData,
                 const QString &auditLogAsHtml, const GpgME::Error &auditLogError);
 
 protected:
-    bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
 private:
     class Private;
diff --git a/lang/qt/src/hierarchicalkeylistjob.h b/lang/qt/src/hierarchicalkeylistjob.h
index 0ebed3c7..362f036c 100644
--- a/lang/qt/src/hierarchicalkeylistjob.h
+++ b/lang/qt/src/hierarchicalkeylistjob.h
@@ -94,16 +94,16 @@ public:
        The \a secretOnly parameter is ignored by
        HierarchicalKeyListJob and must be set to false.
     */
-    GpgME::Error start(const QStringList &patterns, bool secretOnly = false) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QStringList &patterns, bool secretOnly = false) override;
 
     GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly,
-                              std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
+                              std::vector<GpgME::Key> &keys) override;
 
 private Q_SLOTS:
     void slotResult(const GpgME::KeyListResult &);
     void slotNextKey(const GpgME::Key &key);
     /* from Job */
-    void slotCancel() Q_DECL_OVERRIDE;
+    void slotCancel() override;
 
 private:
     GpgME::Error startAJob();
diff --git a/lang/qt/src/multideletejob.h b/lang/qt/src/multideletejob.h
index a6eec1f1..308490fa 100644
--- a/lang/qt/src/multideletejob.h
+++ b/lang/qt/src/multideletejob.h
@@ -84,7 +84,7 @@ public:
     GpgME::Error start(const std::vector<GpgME::Key> &keys, bool allowSecretKeyDeletion = false);
 
     /* from Job */
-    void slotCancel() Q_DECL_OVERRIDE;
+    void slotCancel() override;
 
 Q_SIGNALS:
     void result(const GpgME::Error &result, const GpgME::Key &errorKey);
diff --git a/lang/qt/src/protocol_p.h b/lang/qt/src/protocol_p.h
index 685ac4dd..915fef99 100644
--- a/lang/qt/src/protocol_p.h
+++ b/lang/qt/src/protocol_p.h
@@ -77,7 +77,7 @@ class Protocol : public QGpgME::Protocol
 public:
     explicit Protocol(GpgME::Protocol proto) : mProtocol(proto) {}
 
-    QString name() const Q_DECL_OVERRIDE
+    QString name() const override
     {
         switch (mProtocol) {
         case GpgME::OpenPGP: return QStringLiteral("OpenPGP");
@@ -86,7 +86,7 @@ public:
         }
     }
 
-    QString displayName() const Q_DECL_OVERRIDE
+    QString displayName() const override
     {
         // ah (2.4.16): Where is this used and isn't this inverted
         // with name
@@ -97,12 +97,12 @@ public:
         }
     }
 
-    QGpgME::SpecialJob *specialJob(const char *, const QMap<QString, QVariant> &) const Q_DECL_OVERRIDE
+    QGpgME::SpecialJob *specialJob(const char *, const QMap<QString, QVariant> &) const override
     {
         return nullptr;
     }
 
-    QGpgME::KeyListJob *keyListJob(bool remote, bool includeSigs, bool validate) const Q_DECL_OVERRIDE
+    QGpgME::KeyListJob *keyListJob(bool remote, bool includeSigs, bool validate) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -127,7 +127,7 @@ public:
         return new QGpgME::QGpgMEKeyListJob(context);
     }
 
-    QGpgME::ListAllKeysJob *listAllKeysJob(bool includeSigs, bool validate) const Q_DECL_OVERRIDE
+    QGpgME::ListAllKeysJob *listAllKeysJob(bool includeSigs, bool validate) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -154,7 +154,7 @@ public:
         return new QGpgME::QGpgMEListAllKeysJob(context);
     }
 
-    QGpgME::EncryptJob *encryptJob(bool armor, bool textmode) const Q_DECL_OVERRIDE
+    QGpgME::EncryptJob *encryptJob(bool armor, bool textmode) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -166,7 +166,7 @@ public:
         return new QGpgME::QGpgMEEncryptJob(context);
     }
 
-    QGpgME::DecryptJob *decryptJob() const Q_DECL_OVERRIDE
+    QGpgME::DecryptJob *decryptJob() const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -175,7 +175,7 @@ public:
         return new QGpgME::QGpgMEDecryptJob(context);
     }
 
-    QGpgME::SignJob *signJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
+    QGpgME::SignJob *signJob(bool armor, bool textMode) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -187,7 +187,7 @@ public:
         return new QGpgME::QGpgMESignJob(context);
     }
 
-    QGpgME::VerifyDetachedJob *verifyDetachedJob(bool textMode) const Q_DECL_OVERRIDE
+    QGpgME::VerifyDetachedJob *verifyDetachedJob(bool textMode) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -198,7 +198,7 @@ public:
         return new QGpgME::QGpgMEVerifyDetachedJob(context);
     }
 
-    QGpgME::VerifyOpaqueJob *verifyOpaqueJob(bool textMode) const Q_DECL_OVERRIDE
+    QGpgME::VerifyOpaqueJob *verifyOpaqueJob(bool textMode) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -209,7 +209,7 @@ public:
         return new QGpgME::QGpgMEVerifyOpaqueJob(context);
     }
 
-    QGpgME::KeyGenerationJob *keyGenerationJob() const Q_DECL_OVERRIDE
+    QGpgME::KeyGenerationJob *keyGenerationJob() const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -218,7 +218,7 @@ public:
         return new QGpgME::QGpgMEKeyGenerationJob(context);
     }
 
-    QGpgME::ImportJob *importJob() const Q_DECL_OVERRIDE
+    QGpgME::ImportJob *importJob() const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -227,7 +227,7 @@ public:
         return new QGpgME::QGpgMEImportJob(context);
     }
 
-    QGpgME::ImportFromKeyserverJob *importFromKeyserverJob() const Q_DECL_OVERRIDE
+    QGpgME::ImportFromKeyserverJob *importFromKeyserverJob() const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -249,7 +249,7 @@ public:
         return new QGpgME::QGpgMEReceiveKeysJob{context};
     }
 
-    QGpgME::ExportJob *publicKeyExportJob(bool armor) const Q_DECL_OVERRIDE
+    QGpgME::ExportJob *publicKeyExportJob(bool armor) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -260,7 +260,7 @@ public:
         return new QGpgME::QGpgMEExportJob(context);
     }
 
-    QGpgME::ExportJob *secretKeyExportJob(bool armor, const QString &) const Q_DECL_OVERRIDE
+    QGpgME::ExportJob *secretKeyExportJob(bool armor, const QString &) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -271,7 +271,7 @@ public:
         return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecret);
     }
 
-    QGpgME::ExportJob *secretSubkeyExportJob(bool armor) const Q_DECL_OVERRIDE
+    QGpgME::ExportJob *secretSubkeyExportJob(bool armor) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -282,7 +282,7 @@ public:
         return new QGpgME::QGpgMEExportJob(context, GpgME::Context::ExportSecretSubkey);
     }
 
-    QGpgME::RefreshKeysJob *refreshKeysJob() const Q_DECL_OVERRIDE
+    QGpgME::RefreshKeysJob *refreshKeysJob() const override
     {
         if (mProtocol != GpgME::CMS) {
             return nullptr;
@@ -291,7 +291,7 @@ public:
         return new QGpgME::QGpgMERefreshSMIMEKeysJob;
     }
 
-    QGpgME::DownloadJob *downloadJob(bool armor) const Q_DECL_OVERRIDE
+    QGpgME::DownloadJob *downloadJob(bool armor) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -304,7 +304,7 @@ public:
         return new QGpgME::QGpgMEDownloadJob(context);
     }
 
-    QGpgME::DeleteJob *deleteJob() const Q_DECL_OVERRIDE
+    QGpgME::DeleteJob *deleteJob() const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -313,7 +313,7 @@ public:
         return new QGpgME::QGpgMEDeleteJob(context);
     }
 
-    QGpgME::SignEncryptJob *signEncryptJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
+    QGpgME::SignEncryptJob *signEncryptJob(bool armor, bool textMode) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -325,7 +325,7 @@ public:
         return new QGpgME::QGpgMESignEncryptJob(context);
     }
 
-    QGpgME::DecryptVerifyJob *decryptVerifyJob(bool textMode) const Q_DECL_OVERRIDE
+    QGpgME::DecryptVerifyJob *decryptVerifyJob(bool textMode) const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -336,7 +336,7 @@ public:
         return new QGpgME::QGpgMEDecryptVerifyJob(context);
     }
 
-    QGpgME::ChangeExpiryJob *changeExpiryJob() const Q_DECL_OVERRIDE
+    QGpgME::ChangeExpiryJob *changeExpiryJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;    // only supported by gpg
@@ -349,7 +349,7 @@ public:
         return new QGpgME::QGpgMEChangeExpiryJob(context);
     }
 
-    QGpgME::ChangePasswdJob *changePasswdJob() const Q_DECL_OVERRIDE
+    QGpgME::ChangePasswdJob *changePasswdJob() const override
     {
         if (!GpgME::hasFeature(GpgME::PasswdFeature, 0)) {
             return nullptr;
@@ -361,7 +361,7 @@ public:
         return new QGpgME::QGpgMEChangePasswdJob(context);
     }
 
-    QGpgME::SignKeyJob *signKeyJob() const Q_DECL_OVERRIDE
+    QGpgME::SignKeyJob *signKeyJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;    // only supported by gpg
@@ -374,7 +374,7 @@ public:
         return new QGpgME::QGpgMESignKeyJob(context);
     }
 
-    QGpgME::ChangeOwnerTrustJob *changeOwnerTrustJob() const Q_DECL_OVERRIDE
+    QGpgME::ChangeOwnerTrustJob *changeOwnerTrustJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;    // only supported by gpg
@@ -400,7 +400,7 @@ public:
         return new QGpgME::QGpgMEAddExistingSubkeyJob{context};
     }
 
-    QGpgME::AddUserIDJob *addUserIDJob() const Q_DECL_OVERRIDE
+    QGpgME::AddUserIDJob *addUserIDJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;    // only supported by gpg
@@ -413,7 +413,7 @@ public:
         return new QGpgME::QGpgMEAddUserIDJob(context);
     }
 
-    QGpgME::KeyListJob *locateKeysJob() const Q_DECL_OVERRIDE
+    QGpgME::KeyListJob *locateKeysJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
@@ -426,7 +426,7 @@ public:
         return new QGpgME::QGpgMEKeyListJob(context);
     }
 
-    QGpgME::KeyForMailboxJob *keyForMailboxJob() const Q_DECL_OVERRIDE
+    QGpgME::KeyForMailboxJob *keyForMailboxJob() const override
     {
         GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
         if (!context) {
@@ -435,7 +435,7 @@ public:
         return new QGpgME::QGpgMEKeyForMailboxJob(context);
     }
 
-    QGpgME::WKDLookupJob *wkdLookupJob() const Q_DECL_OVERRIDE
+    QGpgME::WKDLookupJob *wkdLookupJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
@@ -447,7 +447,7 @@ public:
         return new QGpgME::QGpgMEWKDLookupJob(context.release());
     }
 
-    QGpgME::WKSPublishJob *wksPublishJob() const Q_DECL_OVERRIDE
+    QGpgME::WKSPublishJob *wksPublishJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
@@ -459,7 +459,7 @@ public:
         return new QGpgME::QGpgMEWKSPublishJob(context.release());
     }
 
-    QGpgME::TofuPolicyJob *tofuPolicyJob() const Q_DECL_OVERRIDE
+    QGpgME::TofuPolicyJob *tofuPolicyJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
@@ -471,7 +471,7 @@ public:
         return new QGpgME::QGpgMETofuPolicyJob(context);
     }
 
-    QGpgME::QuickJob *quickJob() const Q_DECL_OVERRIDE
+    QGpgME::QuickJob *quickJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
@@ -483,7 +483,7 @@ public:
         return new QGpgME::QGpgMEQuickJob(context);
     }
 
-    QGpgME::RevokeKeyJob *revokeKeyJob() const Q_DECL_OVERRIDE
+    QGpgME::RevokeKeyJob *revokeKeyJob() const override
     {
         if (mProtocol != GpgME::OpenPGP) {
             return nullptr;
diff --git a/lang/qt/src/qgpgmeadduseridjob.h b/lang/qt/src/qgpgmeadduseridjob.h
index 71fa4730..26395ba5 100644
--- a/lang/qt/src/qgpgmeadduseridjob.h
+++ b/lang/qt/src/qgpgmeadduseridjob.h
@@ -59,7 +59,7 @@ public:
     ~QGpgMEAddUserIDJob();
 
     /* from AddUserIDJob */
-    GpgME::Error start(const GpgME::Key &key, const QString &name, const QString &email, const QString &comment) Q_DECL_OVERRIDE;
+    GpgME::Error start(const GpgME::Key &key, const QString &name, const QString &email, const QString &comment) override;
 };
 }
 
diff --git a/lang/qt/src/qgpgmechangeexpiryjob.h b/lang/qt/src/qgpgmechangeexpiryjob.h
index bb9b9ba8..ac66e4f7 100644
--- a/lang/qt/src/qgpgmechangeexpiryjob.h
+++ b/lang/qt/src/qgpgmechangeexpiryjob.h
@@ -59,11 +59,11 @@ public:
     ~QGpgMEChangeExpiryJob();
 
     /* from ChangeExpiryJob */
-    GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry) Q_DECL_OVERRIDE;
+    GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry) override;
 
     /* from ChangeExpiryJob */
     GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry,
-                       const std::vector<GpgME::Subkey> &subkeys) Q_DECL_OVERRIDE;
+                       const std::vector<GpgME::Subkey> &subkeys) override;
 
 };
 
diff --git a/lang/qt/src/qgpgmechangeownertrustjob.h b/lang/qt/src/qgpgmechangeownertrustjob.h
index 0f4dbe64..387166e2 100644
--- a/lang/qt/src/qgpgmechangeownertrustjob.h
+++ b/lang/qt/src/qgpgmechangeownertrustjob.h
@@ -59,7 +59,7 @@ public:
     ~QGpgMEChangeOwnerTrustJob();
 
     /* from ChangeOwnerTrustJob */
-    GpgME::Error start(const GpgME::Key &key, GpgME::Key::OwnerTrust trust) Q_DECL_OVERRIDE;
+    GpgME::Error start(const GpgME::Key &key, GpgME::Key::OwnerTrust trust) override;
 };
 }
 
diff --git a/lang/qt/src/qgpgmechangepasswdjob.h b/lang/qt/src/qgpgmechangepasswdjob.h
index 8910a460..fbd9caa5 100644
--- a/lang/qt/src/qgpgmechangepasswdjob.h
+++ b/lang/qt/src/qgpgmechangepasswdjob.h
@@ -59,7 +59,7 @@ public:
     ~QGpgMEChangePasswdJob();
 
     /* from ChangePasswdJob */
-    GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
+    GpgME::Error start(const GpgME::Key &key) override;
 };
 
 }
diff --git a/lang/qt/src/qgpgmedecryptjob.h b/lang/qt/src/qgpgmedecryptjob.h
index 2924378c..ea648667 100644
--- a/lang/qt/src/qgpgmedecryptjob.h
+++ b/lang/qt/src/qgpgmedecryptjob.h
@@ -65,17 +65,17 @@ public:
     ~QGpgMEDecryptJob();
 
     /* from DecryptJob */
-    GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QByteArray &cipherText) override;
 
     /* from DecryptJob */
-    void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
+    void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) override;
 
     /* from DecryptJob */
     GpgME::DecryptionResult exec(const QByteArray &cipherText,
-                                 QByteArray &plainText) Q_DECL_OVERRIDE;
+                                 QByteArray &plainText) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &r) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &r) override;
 
 private:
     GpgME::DecryptionResult mResult;
diff --git a/lang/qt/src/qgpgmedecryptverifyjob.h b/lang/qt/src/qgpgmedecryptverifyjob.h
index eaeec095..01794319 100644
--- a/lang/qt/src/qgpgmedecryptverifyjob.h
+++ b/lang/qt/src/qgpgmedecryptverifyjob.h
@@ -70,17 +70,17 @@ public:
     ~QGpgMEDecryptVerifyJob();
 
     /* from DecryptVerifyJob */
-    GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QByteArray &cipherText) override;
 
     /* from DecryptVerifyJob */
-    void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
+    void start(const std::shared_ptr<QIODevice> &cipherText, const std::shared_ptr<QIODevice> &plainText) override;
 
     /* from DecryptVerifyJob */
     std::pair<GpgME::DecryptionResult, GpgME::VerificationResult>
-    exec(const QByteArray &cipherText, QByteArray &plainText) Q_DECL_OVERRIDE;
+    exec(const QByteArray &cipherText, QByteArray &plainText) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &r) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &r) override;
 
 private:
     std::pair<GpgME::DecryptionResult, GpgME::VerificationResult> mResult;
diff --git a/lang/qt/src/qgpgmedeletejob.h b/lang/qt/src/qgpgmedeletejob.h
index f5d586b5..6228a50c 100644
--- a/lang/qt/src/qgpgmedeletejob.h
+++ b/lang/qt/src/qgpgmedeletejob.h
@@ -64,7 +64,7 @@ public:
     ~QGpgMEDeleteJob();
 
     /* from DeleteJob */
-    GpgME::Error start(const GpgME::Key &key, bool allowSecretKeyDeletion) Q_DECL_OVERRIDE;
+    GpgME::Error start(const GpgME::Key &key, bool allowSecretKeyDeletion) override;
 };
 
 }
diff --git a/lang/qt/src/qgpgmedownloadjob.h b/lang/qt/src/qgpgmedownloadjob.h
index 248c28f5..8aab7479 100644
--- a/lang/qt/src/qgpgmedownloadjob.h
+++ b/lang/qt/src/qgpgmedownloadjob.h
@@ -59,10 +59,10 @@ public:
     ~QGpgMEDownloadJob();
 
     /* from DownloadJob */
-    GpgME::Error start(const QStringList &fingerprints) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QStringList &fingerprints) override;
 
     /* from DownloadJob */
-    GpgME::Error start(const QByteArray &fingerprint, const std::shared_ptr<QIODevice> &keyData) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QByteArray &fingerprint, const std::shared_ptr<QIODevice> &keyData) override;
 };
 
 }
diff --git a/lang/qt/src/qgpgmeencryptjob.h b/lang/qt/src/qgpgmeencryptjob.h
index cba5ec99..07b05f8f 100644
--- a/lang/qt/src/qgpgmeencryptjob.h
+++ b/lang/qt/src/qgpgmeencryptjob.h
@@ -71,34 +71,34 @@ public:
 
     /* from EncryptJob */
     GpgME::Error start(const std::vector<GpgME::Key> &recipients,
-                       const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
+                       const QByteArray &plainText, bool alwaysTrust) override;
 
     /* from EncryptJob */
     void start(const std::vector<GpgME::Key> &recipients,
                const std::shared_ptr<QIODevice> &plainText,
                const std::shared_ptr<QIODevice> &cipherText,
-               bool alwaysTrust) Q_DECL_OVERRIDE;
+               bool alwaysTrust) override;
 
     /* from EncryptJob */
     GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients,
                                  const QByteArray &plainText, bool alwaysTrust,
-                                 QByteArray &cipherText) Q_DECL_OVERRIDE;
+                                 QByteArray &cipherText) override;
     /* from EncryptJob */
     void start(const std::vector<GpgME::Key> &recipients,
                const std::shared_ptr<QIODevice> &plainText,
                const std::shared_ptr<QIODevice> &cipherText,
-               const GpgME::Context::EncryptionFlags flags) Q_DECL_OVERRIDE;
+               const GpgME::Context::EncryptionFlags flags) override;
 
     /* from EncryptJob */
     GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients,
                                  const QByteArray &plainText, const GpgME::Context::EncryptionFlags flags,
-                                 QByteArray &cipherText) Q_DECL_OVERRIDE;
+                                 QByteArray &cipherText) override;
 
     /* from EncryptJob */
-    void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
+    void setOutputIsBase64Encoded(bool on) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &r) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &r) override;
 
 private:
     bool mOutputIsBase64Encoded;
diff --git a/lang/qt/src/qgpgmeexportjob.h b/lang/qt/src/qgpgmeexportjob.h
index b77bad1c..272fff4d 100644
--- a/lang/qt/src/qgpgmeexportjob.h
+++ b/lang/qt/src/qgpgmeexportjob.h
@@ -62,13 +62,13 @@ public:
     // export mode flags set with @p exportMode cannot be overridden with
     // setExportFlags.
     explicit QGpgMEExportJob(GpgME::Context *context, unsigned int exportMode);
-    ~QGpgMEExportJob() Q_DECL_OVERRIDE;
+    ~QGpgMEExportJob() override;
 
     /* from ExportJob */
-    void setExportFlags(unsigned int flags) Q_DECL_OVERRIDE;
+    void setExportFlags(unsigned int flags) override;
 
     /* from ExportJob */
-    GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QStringList &patterns) override;
 
 private:
     unsigned int m_exportMode;
diff --git a/lang/qt/src/qgpgmegpgcardjob.h b/lang/qt/src/qgpgmegpgcardjob.h
index bed68b2d..c78c0ee5 100644
--- a/lang/qt/src/qgpgmegpgcardjob.h
+++ b/lang/qt/src/qgpgmegpgcardjob.h
@@ -54,9 +54,9 @@ public:
     explicit QGpgMEGpgCardJob();
     ~QGpgMEGpgCardJob();
 
-    GpgME::Error start(const QStringList &cmds) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QStringList &cmds) override;
 
-    GpgME::Error exec(const QStringList &cmds, QString &std_out, QString &std_err, int &exitCode) Q_DECL_OVERRIDE;
+    GpgME::Error exec(const QStringList &cmds, QString &std_out, QString &std_err, int &exitCode) override;
 };
 
 }
diff --git a/lang/qt/src/qgpgmeimportfromkeyserverjob.h b/lang/qt/src/qgpgmeimportfromkeyserverjob.h
index 6ecce81b..1dfcbc19 100644
--- a/lang/qt/src/qgpgmeimportfromkeyserverjob.h
+++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.h
@@ -65,13 +65,13 @@ public:
     ~QGpgMEImportFromKeyserverJob();
 
     /* from ImportFromKeyserverJob */
-    GpgME::Error start(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
+    GpgME::Error start(const std::vector<GpgME::Key> &keys) override;
 
     /* from ImportFromKeyserverJob */
-    GpgME::ImportResult exec(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
+    GpgME::ImportResult exec(const std::vector<GpgME::Key> &keys) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &r) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &r) override;
 
 private:
     GpgME::ImportResult mResult;
diff --git a/lang/qt/src/qgpgmeimportjob.h b/lang/qt/src/qgpgmeimportjob.h
index ec4d39b4..4c22ae92 100644
--- a/lang/qt/src/qgpgmeimportjob.h
+++ b/lang/qt/src/qgpgmeimportjob.h
@@ -67,15 +67,15 @@ public:
     ~QGpgMEImportJob();
 
     /* from ImportJob */
-    GpgME::Error start(const QByteArray &keyData) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QByteArray &keyData) override;
 
     /* from ImportJob */
-    GpgME::ImportResult exec(const QByteArray &keyData) Q_DECL_OVERRIDE;
+    GpgME::ImportResult exec(const QByteArray &keyData) override;
 
     GpgME::Error startLater(const QByteArray &keyData) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &r) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &r) override;
 
 private:
     GpgME::ImportResult mResult;
diff --git a/lang/qt/src/qgpgmekeyformailboxjob.h b/lang/qt/src/qgpgmekeyformailboxjob.h
index a14e470b..8c26691a 100644
--- a/lang/qt/src/qgpgmekeyformailboxjob.h
+++ b/lang/qt/src/qgpgmekeyformailboxjob.h
@@ -76,9 +76,9 @@ public:
       usage are returned. Use this if you need to select a
       key for signing.
     */
-    GpgME::Error start(const QString &mailbox, bool canEncrypt = true) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QString &mailbox, bool canEncrypt = true) override;
 
-    GpgME::KeyListResult exec(const QString &mailbox, bool canEncrypt, GpgME::Key &key, GpgME::UserID &uid) Q_DECL_OVERRIDE;
+    GpgME::KeyListResult exec(const QString &mailbox, bool canEncrypt, GpgME::Key &key, GpgME::UserID &uid) override;
 };
 
 }
diff --git a/lang/qt/src/qgpgmekeygenerationjob.h b/lang/qt/src/qgpgmekeygenerationjob.h
index 1fa28d5d..31ee003f 100644
--- a/lang/qt/src/qgpgmekeygenerationjob.h
+++ b/lang/qt/src/qgpgmekeygenerationjob.h
@@ -65,7 +65,7 @@ public:
     ~QGpgMEKeyGenerationJob();
 
     /* from KeygenerationJob */
-    GpgME::Error start(const QString &parameters) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QString &parameters) override;
 };
 
 }
diff --git a/lang/qt/src/qgpgmekeylistjob.h b/lang/qt/src/qgpgmekeylistjob.h
index 9e505a10..f945a6fe 100644
--- a/lang/qt/src/qgpgmekeylistjob.h
+++ b/lang/qt/src/qgpgmekeylistjob.h
@@ -70,15 +70,15 @@ public:
     ~QGpgMEKeyListJob();
 
     /* from KeyListJob */
-    GpgME::Error start(const QStringList &patterns, bool secretOnly) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QStringList &patterns, bool secretOnly) override;
 
     /* from KeyListJob */
-    GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
+    GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, std::vector<GpgME::Key> &keys) override;
 
-    void addMode(GpgME::KeyListMode mode) Q_DECL_OVERRIDE;
+    void addMode(GpgME::KeyListMode mode) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &result) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &result) override;
 private:
     GpgME::KeyListResult mResult;
     bool mSecretOnly;
diff --git a/lang/qt/src/qgpgmelistallkeysjob.h b/lang/qt/src/qgpgmelistallkeysjob.h
index 091f9f15..df365ce2 100644
--- a/lang/qt/src/qgpgmelistallkeysjob.h
+++ b/lang/qt/src/qgpgmelistallkeysjob.h
@@ -70,13 +70,13 @@ public:
     ~QGpgMEListAllKeysJob();
 
     /* from ListAllKeysJob */
-    GpgME::Error start(bool mergeKeys) Q_DECL_OVERRIDE;
+    GpgME::Error start(bool mergeKeys) override;
 
     /* from ListAllKeysJob */
-    GpgME::KeyListResult exec(std::vector<GpgME::Key> &pub, std::vector<GpgME::Key> &sec, bool mergeKeys) Q_DECL_OVERRIDE;
+    GpgME::KeyListResult exec(std::vector<GpgME::Key> &pub, std::vector<GpgME::Key> &sec, bool mergeKeys) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &result) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &result) override;
 
 private:
     GpgME::KeyListResult mResult;
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.h b/lang/qt/src/qgpgmenewcryptoconfig.h
index 15579fd7..7bdf5d3a 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.h
+++ b/lang/qt/src/qgpgmenewcryptoconfig.h
@@ -63,36 +63,36 @@ public:
     QGpgMENewCryptoConfigEntry(const std::shared_ptr<QGpgMENewCryptoConfigGroup> &group, const GpgME::Configuration::Option &option);
     ~QGpgMENewCryptoConfigEntry();
 
-    QString name() const Q_DECL_OVERRIDE;
-    QString description() const Q_DECL_OVERRIDE;
-    QString path() const Q_DECL_OVERRIDE;
-    bool isOptional() const Q_DECL_OVERRIDE;
-    bool isReadOnly() const Q_DECL_OVERRIDE;
-    bool isList() const Q_DECL_OVERRIDE;
-    bool isRuntime() const Q_DECL_OVERRIDE;
-    Level level() const Q_DECL_OVERRIDE;
-    ArgType argType() const Q_DECL_OVERRIDE;
-    bool isSet() const Q_DECL_OVERRIDE;
-    bool boolValue() const Q_DECL_OVERRIDE;
-    QString stringValue() const Q_DECL_OVERRIDE;
-    int intValue() const Q_DECL_OVERRIDE;
-    unsigned int uintValue() const Q_DECL_OVERRIDE;
-    QUrl urlValue() const Q_DECL_OVERRIDE;
-    unsigned int numberOfTimesSet() const Q_DECL_OVERRIDE;
-    std::vector<int> intValueList() const Q_DECL_OVERRIDE;
-    std::vector<unsigned int> uintValueList() const Q_DECL_OVERRIDE;
-    QList<QUrl> urlValueList() const Q_DECL_OVERRIDE;
-    void resetToDefault() Q_DECL_OVERRIDE;
-    void setBoolValue(bool) Q_DECL_OVERRIDE;
-    void setStringValue(const QString &) Q_DECL_OVERRIDE;
-    void setIntValue(int) Q_DECL_OVERRIDE;
-    void setUIntValue(unsigned int) Q_DECL_OVERRIDE;
-    void setURLValue(const QUrl &) Q_DECL_OVERRIDE;
-    void setNumberOfTimesSet(unsigned int) Q_DECL_OVERRIDE;
-    void setIntValueList(const std::vector<int> &) Q_DECL_OVERRIDE;
-    void setUIntValueList(const std::vector<unsigned int> &) Q_DECL_OVERRIDE;
-    void setURLValueList(const QList<QUrl> &) Q_DECL_OVERRIDE;
-    bool isDirty() const Q_DECL_OVERRIDE;
+    QString name() const override;
+    QString description() const override;
+    QString path() const override;
+    bool isOptional() const override;
+    bool isReadOnly() const override;
+    bool isList() const override;
+    bool isRuntime() const override;
+    Level level() const override;
+    ArgType argType() const override;
+    bool isSet() const override;
+    bool boolValue() const override;
+    QString stringValue() const override;
+    int intValue() const override;
+    unsigned int uintValue() const override;
+    QUrl urlValue() const override;
+    unsigned int numberOfTimesSet() const override;
+    std::vector<int> intValueList() const override;
+    std::vector<unsigned int> uintValueList() const override;
+    QList<QUrl> urlValueList() const override;
+    void resetToDefault() override;
+    void setBoolValue(bool) override;
+    void setStringValue(const QString &) override;
+    void setIntValue(int) override;
+    void setUIntValue(unsigned int) override;
+    void setURLValue(const QUrl &) override;
+    void setNumberOfTimesSet(unsigned int) override;
+    void setIntValueList(const std::vector<int> &) override;
+    void setUIntValueList(const std::vector<unsigned int> &) override;
+    void setURLValueList(const QList<QUrl> &) override;
+    bool isDirty() const override;
 
     QStringList stringValueList() const;
     QVariant defaultValue() const;
@@ -117,16 +117,16 @@ public:
     QGpgMENewCryptoConfigGroup(const std::shared_ptr<QGpgMENewCryptoConfigComponent> &parent, const GpgME::Configuration::Option &option);
     ~QGpgMENewCryptoConfigGroup();
 
-    QString name() const Q_DECL_OVERRIDE;
-    QString iconName() const Q_DECL_OVERRIDE
+    QString name() const override;
+    QString iconName() const override
     {
         return QString();
     }
-    QString description() const Q_DECL_OVERRIDE;
-    QString path() const Q_DECL_OVERRIDE;
-    QGpgME::CryptoConfigEntry::Level level() const Q_DECL_OVERRIDE;
-    QStringList entryList() const Q_DECL_OVERRIDE;
-    QGpgMENewCryptoConfigEntry *entry(const QString &name) const Q_DECL_OVERRIDE;
+    QString description() const override;
+    QString path() const override;
+    QGpgME::CryptoConfigEntry::Level level() const override;
+    QStringList entryList() const override;
+    QGpgMENewCryptoConfigEntry *entry(const QString &name) const override;
 
 private:
     friend class QGpgMENewCryptoConfigComponent; // it adds the entries
@@ -145,14 +145,14 @@ public:
 
     void setComponent(const GpgME::Configuration::Component &component);
 
-    QString name() const Q_DECL_OVERRIDE;
-    QString iconName() const Q_DECL_OVERRIDE
+    QString name() const override;
+    QString iconName() const override
     {
         return name();
     }
-    QString description() const Q_DECL_OVERRIDE;
-    QStringList groupList() const Q_DECL_OVERRIDE;
-    QGpgMENewCryptoConfigGroup *group(const QString &name) const Q_DECL_OVERRIDE;
+    QString description() const override;
+    QStringList groupList() const override;
+    QGpgMENewCryptoConfigGroup *group(const QString &name) const override;
 
     void sync(bool runtime);
 
@@ -174,12 +174,12 @@ public:
     QGpgMENewCryptoConfig();
     ~QGpgMENewCryptoConfig();
 
-    QStringList componentList() const Q_DECL_OVERRIDE;
+    QStringList componentList() const override;
 
-    QGpgMENewCryptoConfigComponent *component(const QString &name) const Q_DECL_OVERRIDE;
+    QGpgMENewCryptoConfigComponent *component(const QString &name) const override;
 
-    void clear() Q_DECL_OVERRIDE;
-    void sync(bool runtime) Q_DECL_OVERRIDE;
+    void clear() override;
+    void sync(bool runtime) override;
 
 private:
     /// @param showErrors if true, a messagebox will be shown if e.g. gpgconf wasn't found
diff --git a/lang/qt/src/qgpgmequickjob.h b/lang/qt/src/qgpgmequickjob.h
index b4e2dfa9..2f59d8d4 100644
--- a/lang/qt/src/qgpgmequickjob.h
+++ b/lang/qt/src/qgpgmequickjob.h
@@ -63,14 +63,14 @@ public:
                      const char *algo,
                      const QDateTime &expires = QDateTime(),
                      const GpgME::Key &key = GpgME::Key(),
-                     unsigned int flags = 0) Q_DECL_OVERRIDE;
-    void startAddUid(const GpgME::Key &key, const QString &uid) Q_DECL_OVERRIDE;
-    void startRevUid(const GpgME::Key &key, const QString &uid) Q_DECL_OVERRIDE;
+                     unsigned int flags = 0) override;
+    void startAddUid(const GpgME::Key &key, const QString &uid) override;
+    void startRevUid(const GpgME::Key &key, const QString &uid) override;
     void startAddSubkey(const GpgME::Key &key, const char *algo,
                         const QDateTime &expires = QDateTime(),
-                        unsigned int flags = 0) Q_DECL_OVERRIDE;
+                        unsigned int flags = 0) override;
     void startRevokeSignature(const GpgME::Key &key, const GpgME::Key &signingKey,
-                              const std::vector<GpgME::UserID> &userIds = std::vector<GpgME::UserID>()) Q_DECL_OVERRIDE;
+                              const std::vector<GpgME::UserID> &userIds = std::vector<GpgME::UserID>()) override;
 };
 
 }
diff --git a/lang/qt/src/qgpgmerefreshsmimekeysjob.h b/lang/qt/src/qgpgmerefreshsmimekeysjob.h
index b5b70e99..b75bb0e2 100644
--- a/lang/qt/src/qgpgmerefreshsmimekeysjob.h
+++ b/lang/qt/src/qgpgmerefreshsmimekeysjob.h
@@ -56,13 +56,13 @@ public:
     ~QGpgMERefreshSMIMEKeysJob();
 
     /* from RefreshKeysJob */
-    GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QStringList &patterns) override;
 
     GpgME::Error start(const std::vector<GpgME::Key> &keys) override;
 
 private Q_SLOTS:
     /* from Job */
-    void slotCancel() Q_DECL_OVERRIDE;
+    void slotCancel() override;
 
     void slotStatus(QProcess *, const QString &, const QStringList &);
     void slotProcessExited(int exitCode, QProcess::ExitStatus exitStatus);
diff --git a/lang/qt/src/qgpgmesignencryptjob.h b/lang/qt/src/qgpgmesignencryptjob.h
index 789e69c7..cf6053b5 100644
--- a/lang/qt/src/qgpgmesignencryptjob.h
+++ b/lang/qt/src/qgpgmesignencryptjob.h
@@ -79,38 +79,38 @@ public:
     /* from SignEncryptJob */
     GpgME::Error start(const std::vector<GpgME::Key> &signers,
                        const std::vector<GpgME::Key> &recipients,
-                       const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
+                       const QByteArray &plainText, bool alwaysTrust) override;
 
     /* from SignEncryptJob */
     void start(const std::vector<GpgME::Key> &signers,
                const std::vector<GpgME::Key> &recipients,
                const std::shared_ptr<QIODevice> &plainText,
                const std::shared_ptr<QIODevice> &cipherText,
-               bool alwaysTrust) Q_DECL_OVERRIDE;
+               bool alwaysTrust) override;
 
     void start(const std::vector<GpgME::Key> &signers,
                const std::vector<GpgME::Key> &recipients,
                const std::shared_ptr<QIODevice> &plainText,
                const std::shared_ptr<QIODevice> &cipherText,
-               const GpgME::Context::EncryptionFlags flags) Q_DECL_OVERRIDE;
+               const GpgME::Context::EncryptionFlags flags) override;
 
     std::pair<GpgME::SigningResult, GpgME::EncryptionResult>
     exec(const std::vector<GpgME::Key> &signers,
          const std::vector<GpgME::Key> &recipients,
          const QByteArray &plainText, bool alwaysTrust,
-         QByteArray &cipherText) Q_DECL_OVERRIDE;
+         QByteArray &cipherText) override;
 
     std::pair<GpgME::SigningResult, GpgME::EncryptionResult>
     exec(const std::vector<GpgME::Key> &signers,
          const std::vector<GpgME::Key> &recipients,
          const QByteArray &plainText, const GpgME::Context::EncryptionFlags flags,
-         QByteArray &cipherText) Q_DECL_OVERRIDE;
+         QByteArray &cipherText) override;
 
     /* from SignEncryptJob */
-    void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
+    void setOutputIsBase64Encoded(bool on) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &r) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &r) override;
 
 private:
     bool mOutputIsBase64Encoded;
diff --git a/lang/qt/src/qgpgmesignjob.h b/lang/qt/src/qgpgmesignjob.h
index c6203a18..d4d2577e 100644
--- a/lang/qt/src/qgpgmesignjob.h
+++ b/lang/qt/src/qgpgmesignjob.h
@@ -72,25 +72,25 @@ public:
     /* from SignJob */
     GpgME::Error start(const std::vector<GpgME::Key> &signers,
                        const QByteArray &plainText,
-                       GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
+                       GpgME::SignatureMode mode) override;
 
     /* from SignJob */
     void start(const std::vector<GpgME::Key> &signers,
                const std::shared_ptr<QIODevice> &plainText,
                const std::shared_ptr<QIODevice> &signature,
-               GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
+               GpgME::SignatureMode mode) override;
 
     /* from SignJob */
     GpgME::SigningResult exec(const std::vector<GpgME::Key> &signers,
                               const QByteArray &plainText,
                               GpgME::SignatureMode mode,
-                              QByteArray &signature) Q_DECL_OVERRIDE;
+                              QByteArray &signature) override;
 
     /* from SignJob */
-    void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
+    void setOutputIsBase64Encoded(bool on) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &r) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &r) override;
 
 private:
     GpgME::SigningResult mResult;
diff --git a/lang/qt/src/qgpgmesignkeyjob.h b/lang/qt/src/qgpgmesignkeyjob.h
index 2ea9e94c..0316beb6 100644
--- a/lang/qt/src/qgpgmesignkeyjob.h
+++ b/lang/qt/src/qgpgmesignkeyjob.h
@@ -61,31 +61,31 @@ public:
     ~QGpgMESignKeyJob();
 
     /* from SignKeyJob */
-    GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
+    GpgME::Error start(const GpgME::Key &key) override;
 
     /* from SignKeyJob */
-    void setUserIDsToSign(const std::vector<unsigned int> &idsToSign) Q_DECL_OVERRIDE;
+    void setUserIDsToSign(const std::vector<unsigned int> &idsToSign) override;
 
     /* from SignKeyJob */
-    void setCheckLevel(unsigned int checkLevel) Q_DECL_OVERRIDE;
+    void setCheckLevel(unsigned int checkLevel) override;
 
     /* from SignKeyJob */
-    void setExportable(bool exportable) Q_DECL_OVERRIDE;
+    void setExportable(bool exportable) override;
 
     /* from SignKeyJob */
-    void setSigningKey(const GpgME::Key &key) Q_DECL_OVERRIDE;
+    void setSigningKey(const GpgME::Key &key) override;
 
     /* from SignKeyJob */
-    void setNonRevocable(bool nonRevocable) Q_DECL_OVERRIDE;
+    void setNonRevocable(bool nonRevocable) override;
 
     /* from SignKeyJob */
-    void setRemark(const QString &remark) Q_DECL_OVERRIDE;
+    void setRemark(const QString &remark) override;
 
     /* from SignKeyJob */
-    void setDupeOk(bool value) Q_DECL_OVERRIDE;
+    void setDupeOk(bool value) override;
 
     /* from SignKeyJob */
-    void setTrustSignature(GpgME::TrustSignatureTrust trust, unsigned short depth, const QString &scope) Q_DECL_OVERRIDE;
+    void setTrustSignature(GpgME::TrustSignatureTrust trust, unsigned short depth, const QString &scope) override;
 
     void setExpirationDate(const QDate &expiration) override;
 
diff --git a/lang/qt/src/qgpgmetofupolicyjob.h b/lang/qt/src/qgpgmetofupolicyjob.h
index 482a8fd9..ad09045d 100644
--- a/lang/qt/src/qgpgmetofupolicyjob.h
+++ b/lang/qt/src/qgpgmetofupolicyjob.h
@@ -57,8 +57,8 @@ public:
     explicit QGpgMETofuPolicyJob(GpgME::Context *context);
     ~QGpgMETofuPolicyJob();
 
-    void start(const GpgME::Key &key, GpgME::TofuInfo::Policy policy) Q_DECL_OVERRIDE;
-    GpgME::Error exec(const GpgME::Key &key, GpgME::TofuInfo::Policy policy) Q_DECL_OVERRIDE;
+    void start(const GpgME::Key &key, GpgME::TofuInfo::Policy policy) override;
+    GpgME::Error exec(const GpgME::Key &key, GpgME::TofuInfo::Policy policy) override;
 };
 
 }
diff --git a/lang/qt/src/qgpgmeverifydetachedjob.h b/lang/qt/src/qgpgmeverifydetachedjob.h
index 81c49f3e..49161396 100644
--- a/lang/qt/src/qgpgmeverifydetachedjob.h
+++ b/lang/qt/src/qgpgmeverifydetachedjob.h
@@ -65,17 +65,17 @@ public:
     ~QGpgMEVerifyDetachedJob();
 
     /* from VerifyDetachedJob */
-    GpgME::Error start(const QByteArray &signature, const QByteArray &signedData) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QByteArray &signature, const QByteArray &signedData) override;
 
     /* from VerifyDetachedJob */
-    void start(const std::shared_ptr<QIODevice> &signature, const std::shared_ptr<QIODevice> &signedData) Q_DECL_OVERRIDE;
+    void start(const std::shared_ptr<QIODevice> &signature, const std::shared_ptr<QIODevice> &signedData) override;
 
     /* from VerifyDetachedJob */
     GpgME::VerificationResult exec(const QByteArray &signature,
-                                   const QByteArray &signedData) Q_DECL_OVERRIDE;
+                                   const QByteArray &signedData) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &r) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &r) override;
 
 private:
     GpgME::VerificationResult mResult;
diff --git a/lang/qt/src/qgpgmeverifyopaquejob.h b/lang/qt/src/qgpgmeverifyopaquejob.h
index 3ba05098..ae51227c 100644
--- a/lang/qt/src/qgpgmeverifyopaquejob.h
+++ b/lang/qt/src/qgpgmeverifyopaquejob.h
@@ -65,16 +65,16 @@ public:
     ~QGpgMEVerifyOpaqueJob();
 
     /* from VerifyOpaqueJob */
-    GpgME::Error start(const QByteArray &signedData) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QByteArray &signedData) override;
 
     /* from VerifyOpaqueJob */
-    void start(const std::shared_ptr<QIODevice> &signedData, const std::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
+    void start(const std::shared_ptr<QIODevice> &signedData, const std::shared_ptr<QIODevice> &plainText) override;
 
     /* form VerifyOpaqueJob */
-    GpgME::VerificationResult exec(const QByteArray &signedData, QByteArray &plainData) Q_DECL_OVERRIDE;
+    GpgME::VerificationResult exec(const QByteArray &signedData, QByteArray &plainData) override;
 
     /* from ThreadedJobMixin */
-    void resultHook(const result_type &r) Q_DECL_OVERRIDE;
+    void resultHook(const result_type &r) override;
 
 private:
     GpgME::VerificationResult mResult;
diff --git a/lang/qt/src/qgpgmewkdlookupjob.h b/lang/qt/src/qgpgmewkdlookupjob.h
index 61f9465c..9a206d25 100644
--- a/lang/qt/src/qgpgmewkdlookupjob.h
+++ b/lang/qt/src/qgpgmewkdlookupjob.h
@@ -59,10 +59,10 @@ public:
     ~QGpgMEWKDLookupJob();
 
     /* from WKDLookupJob */
-    GpgME::Error start(const QString &email) Q_DECL_OVERRIDE;
+    GpgME::Error start(const QString &email) override;
 
     /* from WKDLookupJob */
-    WKDLookupResult exec(const QString &email) Q_DECL_OVERRIDE;
+    WKDLookupResult exec(const QString &email) override;
 };
 
 }
diff --git a/lang/qt/src/qgpgmewkspublishjob.h b/lang/qt/src/qgpgmewkspublishjob.h
index 211cefb6..a8635e16 100644
--- a/lang/qt/src/qgpgmewkspublishjob.h
+++ b/lang/qt/src/qgpgmewkspublishjob.h
@@ -61,9 +61,9 @@ public:
     explicit QGpgMEWKSPublishJob(GpgME::Context *context);
     ~QGpgMEWKSPublishJob();
 
-    void startCheck(const QString &mailbox) Q_DECL_OVERRIDE;
-    void startCreate(const char *fpr, const QString &mailbox) Q_DECL_OVERRIDE;
-    void startReceive(const QByteArray &response) Q_DECL_OVERRIDE;
+    void startCheck(const QString &mailbox) override;
+    void startCreate(const char *fpr, const QString &mailbox) override;
+    void startReceive(const QByteArray &response) override;
 };
 
 }
diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
index f50ac43d..afabae3b 100644
--- a/lang/qt/src/threadedjobmixin.h
+++ b/lang/qt/src/threadedjobmixin.h
@@ -116,7 +116,7 @@ public:
     }
 
 private:
-    void run() Q_DECL_OVERRIDE {
+    void run() override {
         const QMutexLocker locker(&m_mutex);
         m_result = m_function();
     }
@@ -236,22 +236,22 @@ protected:
         doEmitResult(r);
         this->deleteLater();
     }
-    void slotCancel() Q_DECL_OVERRIDE {
+    void slotCancel() override {
         if (m_ctx)
         {
             m_ctx->cancelPendingOperation();
         }
     }
-    QString auditLogAsHtml() const Q_DECL_OVERRIDE
+    QString auditLogAsHtml() const override
     {
         return m_auditLog;
     }
-    GpgME::Error auditLogError() const Q_DECL_OVERRIDE
+    GpgME::Error auditLogError() const override
     {
         return m_auditLogError;
     }
     void showProgress(const char * /*what*/,
-                      int /*type*/, int current, int total) Q_DECL_OVERRIDE {
+                      int /*type*/, int current, int total) override {
         // will be called from the thread exec'ing the operation, so
         // just bounce everything to the owning thread:
         // ### hope this is thread-safe (meta obj is const, and
diff --git a/lang/qt/tests/t-support.h b/lang/qt/tests/t-support.h
index ecafe2f4..fd7be44a 100644
--- a/lang/qt/tests/t-support.h
+++ b/lang/qt/tests/t-support.h
@@ -89,7 +89,7 @@ class TestPassphraseProvider : public PassphraseProvider
 {
 public:
     char *getPassphrase(const char * /*useridHint*/, const char * /*description*/,
-                        bool /*previousWasBad*/, bool &/*canceled*/) Q_DECL_OVERRIDE
+                        bool /*previousWasBad*/, bool &/*canceled*/) override
     {
         char *ret;
         gpgrt_asprintf(&ret, "abc");