qt: Always include C++ binding headers with gpgme++/ prefix

* lang/qt/src/Makefile.am, lang/qt/tests/Makefile.am (AM_CPPFLAGS): Add builddir instead of srcdir of C++ bindings as include path. * lang/qt/src/changeexpiryjob.cpp, lang/qt/src/changeexpiryjob.h, lang/qt/src/changeownertrustjob.h, lang/qt/src/dataprovider.cpp, lang/qt/src/dataprovider.h, lang/qt/src/debug.cpp, lang/qt/src/decryptverifyarchivejob.cpp, lang/qt/src/decryptverifyarchivejob.h, lang/qt/src/encryptarchivejob.cpp, lang/qt/src/encryptarchivejob.h, lang/qt/src/encryptjob.h, lang/qt/src/encryptjob_p.h, lang/qt/src/filelistdataprovider.cpp, lang/qt/src/filelistdataprovider.h, lang/qt/src/hierarchicalkeylistjob.h, lang/qt/src/importjob.cpp, lang/qt/src/importjob.h, lang/qt/src/importjob_p.h, lang/qt/src/job.h, lang/qt/src/keyformailboxjob.h, lang/qt/src/keylistjob.h, lang/qt/src/listallkeysjob.h, lang/qt/src/multideletejob.cpp, lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp, lang/qt/src/qgpgmeadduseridjob.cpp, lang/qt/src/qgpgmebackend.cpp, lang/qt/src/qgpgmechangeexpiryjob.cpp, lang/qt/src/qgpgmechangeownertrustjob.cpp, lang/qt/src/qgpgmechangepasswdjob.cpp, lang/qt/src/qgpgmedecryptjob.cpp, lang/qt/src/qgpgmedecryptjob.h, lang/qt/src/qgpgmedecryptverifyarchivejob.cpp, lang/qt/src/qgpgmedecryptverifyarchivejob.h, lang/qt/src/qgpgmedecryptverifyjob.cpp, lang/qt/src/qgpgmedecryptverifyjob.h, lang/qt/src/qgpgmedeletejob.cpp, lang/qt/src/qgpgmedownloadjob.cpp, lang/qt/src/qgpgmeencryptarchivejob.cpp, lang/qt/src/qgpgmeencryptarchivejob.h, lang/qt/src/qgpgmeencryptjob.cpp, lang/qt/src/qgpgmeencryptjob.h, lang/qt/src/qgpgmeexportjob.cpp, lang/qt/src/qgpgmeimportfromkeyserverjob.cpp, lang/qt/src/qgpgmeimportfromkeyserverjob.h, lang/qt/src/qgpgmeimportjob.cpp, lang/qt/src/qgpgmeimportjob.h, lang/qt/src/qgpgmekeyformailboxjob.h, lang/qt/src/qgpgmekeygenerationjob.cpp, lang/qt/src/qgpgmekeygenerationjob.h, lang/qt/src/qgpgmekeylistjob.cpp, lang/qt/src/qgpgmekeylistjob.h, lang/qt/src/qgpgmelistallkeysjob.cpp, lang/qt/src/qgpgmelistallkeysjob.h, lang/qt/src/qgpgmenewcryptoconfig.cpp, lang/qt/src/qgpgmenewcryptoconfig.h, lang/qt/src/qgpgmequickjob.cpp, lang/qt/src/qgpgmereceivekeysjob.h, lang/qt/src/qgpgmerefreshsmimekeysjob.cpp, lang/qt/src/qgpgmerefreshsmimekeysjob.h, lang/qt/src/qgpgmerevokekeyjob.cpp, lang/qt/src/qgpgmesetprimaryuseridjob.cpp, lang/qt/src/qgpgmesignarchivejob.cpp, lang/qt/src/qgpgmesignarchivejob.h, lang/qt/src/qgpgmesignencryptarchivejob.cpp, lang/qt/src/qgpgmesignencryptarchivejob.h, lang/qt/src/qgpgmesignencryptjob.cpp, lang/qt/src/qgpgmesignencryptjob.h, lang/qt/src/qgpgmesignjob.cpp, lang/qt/src/qgpgmesignjob.h, lang/qt/src/qgpgmesignkeyjob.cpp, lang/qt/src/qgpgmetofupolicyjob.cpp, lang/qt/src/qgpgmeverifydetachedjob.cpp, lang/qt/src/qgpgmeverifydetachedjob.h, lang/qt/src/qgpgmeverifyopaquejob.cpp, lang/qt/src/qgpgmeverifyopaquejob.h, lang/qt/src/qgpgmewkdlookupjob.cpp, lang/qt/src/qgpgmewkdrefreshjob.cpp, lang/qt/src/qgpgmewkdrefreshjob.h, lang/qt/src/qgpgmewkspublishjob.cpp, lang/qt/src/quickjob.h, lang/qt/src/signarchivejob.cpp, lang/qt/src/signarchivejob.h, lang/qt/src/signencryptarchivejob.cpp, lang/qt/src/signencryptarchivejob.h, lang/qt/src/signencryptjob.h, lang/qt/src/signencryptjob_p.h, lang/qt/src/signjob.h, lang/qt/src/signjob_p.h, lang/qt/src/threadedjobmixin.cpp, lang/qt/src/threadedjobmixin.h, lang/qt/src/tofupolicyjob.h, lang/qt/src/util.cpp, lang/qt/src/wkdlookupresult.cpp, lang/qt/src/wkdlookupresult.h, lang/qt/src/wkdrefreshjob_p.h, lang/qt/tests/run-decryptverifyarchivejob.cpp, lang/qt/tests/run-decryptverifyjob.cpp, lang/qt/tests/run-encryptarchivejob.cpp, lang/qt/tests/run-encryptjob.cpp, lang/qt/tests/run-exportjob.cpp, lang/qt/tests/run-importjob.cpp, lang/qt/tests/run-keyformailboxjob.cpp, lang/qt/tests/run-receivekeysjob.cpp, lang/qt/tests/run-refreshkeysjob.cpp, lang/qt/tests/run-signarchivejob.cpp, lang/qt/tests/run-signjob.cpp, lang/qt/tests/run-verifydetachedjob.cpp, lang/qt/tests/run-verifyopaquejob.cpp, lang/qt/tests/run-wkdrefreshjob.cpp, lang/qt/tests/t-addexistingsubkey.cpp, lang/qt/tests/t-changeexpiryjob.cpp, lang/qt/tests/t-config.cpp, lang/qt/tests/t-decryptverify.cpp, lang/qt/tests/t-encrypt.cpp, lang/qt/tests/t-import.cpp, lang/qt/tests/t-keylist.cpp, lang/qt/tests/t-keylocate.cpp, lang/qt/tests/t-ownertrust.cpp, lang/qt/tests/t-remarks.cpp, lang/qt/tests/t-revokekey.cpp, lang/qt/tests/t-setprimaryuserid.cpp, lang/qt/tests/t-support.cpp, lang/qt/tests/t-support.h, lang/qt/tests/t-tofuinfo.cpp, lang/qt/tests/t-trustsignatures.cpp, lang/qt/tests/t-various.cpp, lang/qt/tests/t-verify.cpp, lang/qt/tests/t-wkdlookup.cpp, lang/qt/tests/t-wkspublish.cpp: Include GpgME++ headers with gpgme++/ prefix. -- This prepares the Qt bindings for building them separately from the C++ bindings. GnuPG-bug-id: 7110
2024-05-24 11:39:42 +02:00 · 2024-05-24 11:39:42 +02:00 · acf574af64
commit acf574af64
parent b7435b31f6
131 changed files with 239 additions and 415 deletions
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@ -332,7 +332,7 @@ camelcaseinclude_HEADERS = $(camelcase_headers)
 nodist_qgpgmeinclude_HEADERS = qgpgme_version.h

 if WANT_QT5
-AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
+AM_CPPFLAGS = -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \
              @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
              -DBUILDING_QGPGME -Wsuggest-override \
              -Wzero-as-null-pointer-constant
@ -345,7 +345,7 @@ libqgpgme_la_LDFLAGS = -no-undefined -version-info \
                       @LIBQGPGME_LT_CURRENT@:@LIBQGPGME_LT_REVISION@:@LIBQGPGME_LT_AGE@
 endif
 if WANT_QT6
-AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
+AM_CPPFLAGS = -I$(top_builddir)/lang/cpp/src -I$(top_builddir)/src \
              @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ @LIBASSUAN_CFLAGS@ \
              -DBUILDING_QGPGME -Wsuggest-override \
              -Wzero-as-null-pointer-constant
--- a/lang/qt/src/changeexpiryjob.cpp
+++ b/lang/qt/src/changeexpiryjob.cpp
@ -38,7 +38,7 @@
 #include "changeexpiryjob.h"
 #include "changeexpiryjob_p.h"

-#include <context.h>
+#include <gpgme++/context.h>

 using namespace GpgME;
 using namespace QGpgME;
--- a/lang/qt/src/changeexpiryjob.h
+++ b/lang/qt/src/changeexpiryjob.h
@ -37,11 +37,7 @@

 #include "job.h"

-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
-# include <gpgme++/key.h>
-#endif
+#include <gpgme++/key.h>

 #include <vector>

--- a/lang/qt/src/changeownertrustjob.h
+++ b/lang/qt/src/changeownertrustjob.h
@ -37,11 +37,7 @@

 #include "job.h"

-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
-# include <gpgme++/key.h>
-#endif
+#include <gpgme++/key.h>

 namespace QGpgME
 {
--- a/lang/qt/src/dataprovider.cpp
+++ b/lang/qt/src/dataprovider.cpp
@ -28,7 +28,7 @@

 #include <dataprovider.h>

-#include <error.h>
+#include <gpgme++/error.h>

 #include <QIODevice>
 #include <QProcess>
--- a/lang/qt/src/dataprovider.h
+++ b/lang/qt/src/dataprovider.h
@ -26,11 +26,7 @@

 #include "qgpgme_export.h"

-#ifdef BUILDING_QGPGME
-#include <interfaces/dataprovider.h>
-#else
 #include <gpgme++/interfaces/dataprovider.h>
-#endif

 #include <memory>

--- a/lang/qt/src/debug.cpp
+++ b/lang/qt/src/debug.cpp
@ -35,7 +35,7 @@
 #include "config.h"
 #endif

-#include "error.h"
+#include <gpgme++/error.h>
 #include "debug.h"

 #include <QDebug>
--- a/lang/qt/src/decryptverifyarchivejob.cpp
+++ b/lang/qt/src/decryptverifyarchivejob.cpp
@ -38,7 +38,7 @@
 #include "decryptverifyarchivejob.h"
 #include "decryptverifyarchivejob_p.h"

-#include <engineinfo.h>
+#include <gpgme++/engineinfo.h>

 using namespace QGpgME;

--- a/lang/qt/src/decryptverifyarchivejob.h
+++ b/lang/qt/src/decryptverifyarchivejob.h
@ -36,11 +36,7 @@

 #include "job.h"

-#ifdef BUILDING_QGPGME
-# include "context.h"
-#else
-# include <gpgme++/context.h>
-#endif
+#include <gpgme++/context.h>

 namespace GpgME
 {
--- a/lang/qt/src/encryptarchivejob.cpp
+++ b/lang/qt/src/encryptarchivejob.cpp
@ -38,7 +38,7 @@
 #include "encryptarchivejob.h"
 #include "encryptarchivejob_p.h"

-#include <engineinfo.h>
+#include <gpgme++/engineinfo.h>

 using namespace QGpgME;

--- a/lang/qt/src/encryptarchivejob.h
+++ b/lang/qt/src/encryptarchivejob.h
@ -36,11 +36,7 @@

 #include "job.h"

-#ifdef BUILDING_QGPGME
-# include "context.h"
-#else
-# include <gpgme++/context.h>
-#endif
+#include <gpgme++/context.h>

 namespace GpgME
 {
--- a/lang/qt/src/encryptjob.h
+++ b/lang/qt/src/encryptjob.h
@ -38,16 +38,12 @@
 #define __KLEO_ENCRYPTJOB_H__

 #include "job.h"
-#include "data.h"
+#include <gpgme++/data.h>

 #include <memory>
 #include <vector>

-#ifdef BUILDING_QGPGME
-# include "context.h"
-#else
-# include <gpgme++/context.h>
-#endif
+#include <gpgme++/context.h>

 class QByteArray;
 class QIODevice;
--- a/lang/qt/src/encryptjob_p.h
+++ b/lang/qt/src/encryptjob_p.h
@ -36,8 +36,8 @@

 #include "job_p.h"

-#include <data.h>
-#include <key.h>
+#include <gpgme++/data.h>
+#include <gpgme++/key.h>

 namespace QGpgME
 {
--- a/lang/qt/src/filelistdataprovider.cpp
+++ b/lang/qt/src/filelistdataprovider.cpp
@ -41,7 +41,7 @@

 #include <QString>

-#include <error.h>
+#include <gpgme++/error.h>

 #include <numeric>

--- a/lang/qt/src/filelistdataprovider.h
+++ b/lang/qt/src/filelistdataprovider.h
@ -36,11 +36,7 @@

 #include "qgpgme_export.h"

-#ifdef BUILDING_QGPGME
-#include <interfaces/dataprovider.h>
-#else
 #include <gpgme++/interfaces/dataprovider.h>
-#endif

 #include <memory>
 #include <vector>
--- a/lang/qt/src/hierarchicalkeylistjob.h
+++ b/lang/qt/src/hierarchicalkeylistjob.h
@ -39,11 +39,7 @@
 #include "keylistjob.h"
 #include "cryptobackend.h"

-#ifdef BUILDING_QGPGME
-# include "keylistresult.h"
-#else
 #include <gpgme++/keylistresult.h>
-#endif

 #include <QPointer>

--- a/lang/qt/src/importjob.cpp
+++ b/lang/qt/src/importjob.cpp
@ -38,7 +38,7 @@
 #include "importjob.h"
 #include "importjob_p.h"

-#include <context.h>
+#include <gpgme++/context.h>

 using namespace GpgME;
 using namespace QGpgME;
--- a/lang/qt/src/importjob.h
+++ b/lang/qt/src/importjob.h
@ -40,11 +40,7 @@
 #include "abstractimportjob.h"
 #include "qgpgme_export.h"

-#ifdef BUILDING_QGPGME
-# include <key.h>
-#else
-# include <gpgme++/key.h>
-#endif
+#include <gpgme++/key.h>

 namespace GpgME
 {
--- a/lang/qt/src/importjob_p.h
+++ b/lang/qt/src/importjob_p.h
@ -36,7 +36,7 @@

 #include "job_p.h"

-#include <key.h>
+#include <gpgme++/key.h>

 namespace QGpgME
 {
--- a/lang/qt/src/job.h
+++ b/lang/qt/src/job.h
@ -41,11 +41,7 @@
 #include <QString>
 #include <QMap>

-#ifdef BUILDING_QGPGME
-# include "error.h"
-#else
-# include <gpgme++/error.h>
-#endif
+#include <gpgme++/error.h>

 class QWidget;

--- a/lang/qt/src/keyformailboxjob.h
+++ b/lang/qt/src/keyformailboxjob.h
@ -37,11 +37,7 @@

 #include "job.h"

-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
-# include <gpgme++/key.h>
-#endif
+#include <gpgme++/key.h>

 namespace GpgME
 {
--- a/lang/qt/src/keylistjob.h
+++ b/lang/qt/src/keylistjob.h
@ -38,11 +38,7 @@
 #include "job.h"
 #include "qgpgme_export.h"

-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
-# include <gpgme++/key.h>
-#endif
+#include <gpgme++/key.h>

 #include <QtCore/QStringList>

--- a/lang/qt/src/listallkeysjob.h
+++ b/lang/qt/src/listallkeysjob.h
@ -40,11 +40,7 @@
 #include "job.h"
 #include "qgpgme_export.h"

-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
-# include <gpgme++/key.h>
-#endif
+#include <gpgme++/key.h>

 #include <vector>

--- a/lang/qt/src/multideletejob.cpp
+++ b/lang/qt/src/multideletejob.cpp
@ -38,9 +38,9 @@
 #include "protocol.h"
 #include "deletejob.h"

-#include <key.h>
-#include <context.h>
-#include <data.h>
+#include <gpgme++/key.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>

 #include <iterator>

--- a/lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp
+++ b/lang/qt/src/qgpgmeaddexistingsubkeyjob.cpp
@ -41,10 +41,10 @@

 #include <QDateTime>

-#include "context.h"
-#include "data.h"
-#include "gpgaddexistingsubkeyeditinteractor.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/gpgaddexistingsubkeyeditinteractor.h>
+#include <gpgme++/key.h>

 #include <gpg-error.h>

--- a/lang/qt/src/qgpgmeadduseridjob.cpp
+++ b/lang/qt/src/qgpgmeadduseridjob.cpp
@ -40,10 +40,10 @@

 #include "dataprovider.h"

-#include "context.h"
-#include "data.h"
-#include "gpgadduserideditinteractor.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/gpgadduserideditinteractor.h>
+#include <gpgme++/key.h>

 #include <cassert>
 #include <memory>
--- a/lang/qt/src/qgpgmebackend.cpp
+++ b/lang/qt/src/qgpgmebackend.cpp
@ -40,8 +40,8 @@

 #include "qgpgmegpgcardjob.h"

-#include "error.h"
-#include "engineinfo.h"
+#include <gpgme++/error.h>
+#include <gpgme++/engineinfo.h>

 #include "protocol_p.h"

--- a/lang/qt/src/qgpgmechangeexpiryjob.cpp
+++ b/lang/qt/src/qgpgmechangeexpiryjob.cpp
@ -42,8 +42,8 @@

 #include "changeexpiryjob_p.h"

-#include "context.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/key.h>

 #include <QDateTime>

--- a/lang/qt/src/qgpgmechangeownertrustjob.cpp
+++ b/lang/qt/src/qgpgmechangeownertrustjob.cpp
@ -40,10 +40,10 @@

 #include "dataprovider.h"

-#include "context.h"
-#include "data.h"
-#include "gpgsetownertrusteditinteractor.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/gpgsetownertrusteditinteractor.h>
+#include <gpgme++/key.h>

 #include <cassert>
 #include <memory>
--- a/lang/qt/src/qgpgmechangepasswdjob.cpp
+++ b/lang/qt/src/qgpgmechangepasswdjob.cpp
@ -40,9 +40,9 @@

 #include "dataprovider.h"

-#include "context.h"
-#include "data.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/key.h>

 #include <cassert>
 #include <memory>
--- a/lang/qt/src/qgpgmedecryptjob.cpp
+++ b/lang/qt/src/qgpgmedecryptjob.cpp
@ -40,9 +40,9 @@

 #include "dataprovider.h"

-#include "context.h"
-#include "decryptionresult.h"
-#include "data.h"
+#include <gpgme++/context.h>
+#include <gpgme++/decryptionresult.h>
+#include <gpgme++/data.h>

 #include <QBuffer>

--- a/lang/qt/src/qgpgmedecryptjob.h
+++ b/lang/qt/src/qgpgmedecryptjob.h
@ -39,11 +39,7 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "decryptionresult.h"
-#else
 #include <gpgme++/decryptionresult.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp
+++ b/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp
@ -45,7 +45,7 @@

 #include <QFile>

-#include <data.h>
+#include <gpgme++/data.h>

 using namespace QGpgME;
 using namespace GpgME;
--- a/lang/qt/src/qgpgmedecryptverifyarchivejob.h
+++ b/lang/qt/src/qgpgmedecryptverifyarchivejob.h
@ -38,8 +38,8 @@

 #include "threadedjobmixin.h"

-#include <decryptionresult.h>
-#include <verificationresult.h>
+#include <gpgme++/decryptionresult.h>
+#include <gpgme++/verificationresult.h>

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmedecryptverifyjob.cpp
+++ b/lang/qt/src/qgpgmedecryptverifyjob.cpp
@ -42,10 +42,10 @@
 #include "decryptverifyjob_p.h"
 #include "util.h"

-#include <context.h>
-#include <decryptionresult.h>
-#include <verificationresult.h>
-#include <data.h>
+#include <gpgme++/context.h>
+#include <gpgme++/decryptionresult.h>
+#include <gpgme++/verificationresult.h>
+#include <gpgme++/data.h>

 #include <QDebug>
 #include "qgpgme_debug.h"
--- a/lang/qt/src/qgpgmedecryptverifyjob.h
+++ b/lang/qt/src/qgpgmedecryptverifyjob.h
@ -39,16 +39,8 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "decryptionresult.h"
-#else
 #include <gpgme++/decryptionresult.h>
-#endif
-#ifdef BUILDING_QGPGME
-# include "verificationresult.h"
-#else
 #include <gpgme++/verificationresult.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmedeletejob.cpp
+++ b/lang/qt/src/qgpgmedeletejob.cpp
@ -38,8 +38,8 @@

 #include "qgpgmedeletejob.h"

-#include "context.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/key.h>

 #include <cassert>

--- a/lang/qt/src/qgpgmedownloadjob.cpp
+++ b/lang/qt/src/qgpgmedownloadjob.cpp
@ -40,8 +40,8 @@

 #include "dataprovider.h"

-#include "context.h"
-#include "data.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>

 #include <QStringList>

--- a/lang/qt/src/qgpgmeencryptarchivejob.cpp
+++ b/lang/qt/src/qgpgmeencryptarchivejob.cpp
@ -48,7 +48,7 @@

 #include <QFile>

-#include <data.h>
+#include <gpgme++/data.h>

 using namespace QGpgME;
 using namespace GpgME;
--- a/lang/qt/src/qgpgmeencryptarchivejob.h
+++ b/lang/qt/src/qgpgmeencryptarchivejob.h
@ -38,7 +38,7 @@

 #include "threadedjobmixin.h"

-#include <encryptionresult.h>
+#include <gpgme++/encryptionresult.h>

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmeencryptjob.cpp
+++ b/lang/qt/src/qgpgmeencryptjob.cpp
@ -44,9 +44,9 @@
 #include "encryptjob_p.h"
 #include "util.h"

-#include <context.h>
-#include <data.h>
-#include <encryptionresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/encryptionresult.h>

 #include <QBuffer>
 #include <QFileInfo>
--- a/lang/qt/src/qgpgmeencryptjob.h
+++ b/lang/qt/src/qgpgmeencryptjob.h
@ -39,16 +39,8 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "encryptionresult.h"
-#else
 #include <gpgme++/encryptionresult.h>
-#endif
-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
 #include <gpgme++/key.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmeexportjob.cpp
+++ b/lang/qt/src/qgpgmeexportjob.cpp
@ -42,9 +42,9 @@

 #include "dataprovider.h"

-#include "context.h"
-#include "data.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/key.h>

 #include <QStringList>

--- a/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
+++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.cpp
@ -40,9 +40,9 @@

 #include "dataprovider.h"

-#include "context.h"
-#include "data.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/key.h>

 #include <cassert>

--- a/lang/qt/src/qgpgmeimportfromkeyserverjob.h
+++ b/lang/qt/src/qgpgmeimportfromkeyserverjob.h
@ -39,11 +39,7 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "importresult.h"
-#else
 #include <gpgme++/importresult.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmeimportjob.cpp
+++ b/lang/qt/src/qgpgmeimportjob.cpp
@ -44,9 +44,9 @@

 #include "dataprovider.h"

-#include <context.h>
-#include <data.h>
-#include <key.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/key.h>

 using namespace QGpgME;
 using namespace GpgME;
--- a/lang/qt/src/qgpgmeimportjob.h
+++ b/lang/qt/src/qgpgmeimportjob.h
@ -41,11 +41,7 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "importresult.h"
-#else
 #include <gpgme++/importresult.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmekeyformailboxjob.h
+++ b/lang/qt/src/qgpgmekeyformailboxjob.h
@ -39,13 +39,8 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "keylistresult.h"
-# include "key.h"
-#else
-# include <gpgme++/keylistresult.h>
-# include <gpgme++/key.h>
-#endif
+#include <gpgme++/keylistresult.h>
+#include <gpgme++/key.h>

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmekeygenerationjob.cpp
+++ b/lang/qt/src/qgpgmekeygenerationjob.cpp
@ -40,8 +40,8 @@

 #include "dataprovider.h"

-#include "context.h"
-#include "data.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>

 #include <cassert>

--- a/lang/qt/src/qgpgmekeygenerationjob.h
+++ b/lang/qt/src/qgpgmekeygenerationjob.h
@ -39,11 +39,7 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "keygenerationresult.h"
-#else
 #include <gpgme++/keygenerationresult.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmekeylistjob.cpp
+++ b/lang/qt/src/qgpgmekeylistjob.cpp
@ -38,9 +38,9 @@

 #include "qgpgmekeylistjob.h"

-#include "key.h"
-#include "context.h"
-#include "keylistresult.h"
+#include <gpgme++/key.h>
+#include <gpgme++/context.h>
+#include <gpgme++/keylistresult.h>
 #include <gpg-error.h>

 #include <QStringList>
--- a/lang/qt/src/qgpgmekeylistjob.h
+++ b/lang/qt/src/qgpgmekeylistjob.h
@ -39,16 +39,8 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "keylistresult.h"
-#else
 #include <gpgme++/keylistresult.h>
-#endif
-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
 #include <gpgme++/key.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmelistallkeysjob.cpp
+++ b/lang/qt/src/qgpgmelistallkeysjob.cpp
@ -43,11 +43,11 @@
 #include "listallkeysjob_p.h"

 #include "debug.h"
-#include "key.h"
-#include "context.h"
-#include "engineinfo.h"
-#include "global.h"
-#include "keylistresult.h"
+#include <gpgme++/key.h>
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
+#include <gpgme++/global.h>
+#include <gpgme++/keylistresult.h>
 #include "qgpgme_debug.h"

 #include <gpg-error.h>
--- a/lang/qt/src/qgpgmelistallkeysjob.h
+++ b/lang/qt/src/qgpgmelistallkeysjob.h
@ -39,16 +39,8 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "keylistresult.h"
-#else
 #include <gpgme++/keylistresult.h>
-#endif
-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
 #include <gpgme++/key.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
@ -45,8 +45,8 @@
 #include <QDir>
 #include <QList>

-#include "global.h"
-#include "error.h"
+#include <gpgme++/global.h>
+#include <gpgme++/error.h>
 #include "debug.h"

 #include <sstream>
--- a/lang/qt/src/qgpgmenewcryptoconfig.h
+++ b/lang/qt/src/qgpgmenewcryptoconfig.h
@ -42,12 +42,7 @@
 #include <QStringList>
 #include <QVariant>

-#ifdef BUILDING_QGPGME
-# include "configuration.h"
-#else
-# include <gpgme++/configuration.h>
-#endif
-
+#include <gpgme++/configuration.h>

 #include <vector>
 #include <utility>
--- a/lang/qt/src/qgpgmequickjob.cpp
+++ b/lang/qt/src/qgpgmequickjob.cpp
@ -37,8 +37,9 @@

 #include "qgpgmequickjob.h"

-#include "context.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/key.h>
+
 #include "util.h"

 using namespace QGpgME;
--- a/lang/qt/src/qgpgmereceivekeysjob.h
+++ b/lang/qt/src/qgpgmereceivekeysjob.h
@ -38,11 +38,7 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "importresult.h"
-#else
-# include <gpgme++/importresult.h>
-#endif
+#include <gpgme++/importresult.h>

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp
+++ b/lang/qt/src/qgpgmerefreshsmimekeysjob.cpp
@ -44,8 +44,8 @@
 #include <QDebug>
 #include "qgpgme_debug.h"

-#include "context.h"
-#include <key.h>
+#include <gpgme++/context.h>
+#include <gpgme++/key.h>

 #include <QByteArray>
 #include <QMetaObject>
--- a/lang/qt/src/qgpgmerefreshsmimekeysjob.h
+++ b/lang/qt/src/qgpgmerefreshsmimekeysjob.h
@ -36,11 +36,8 @@
 #define __QGPGME_QGPGMEREFRESHSMIMEKEYSJOB_H__

 #include "refreshkeysjob.h"
-#ifdef BUILDING_QGPGME
-# include "context.h"
-#else
-#include "gpgme++/context.h"
-#endif
+
+#include <gpgme++/context.h>

 #include <QStringList>
 #include <QProcess>
--- a/lang/qt/src/qgpgmerevokekeyjob.cpp
+++ b/lang/qt/src/qgpgmerevokekeyjob.cpp
@ -39,10 +39,10 @@

 #include "dataprovider.h"

-#include <context.h>
-#include <data.h>
-#include <gpgrevokekeyeditinteractor.h>
-#include <key.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/gpgrevokekeyeditinteractor.h>
+#include <gpgme++/key.h>

 #include <gpg-error.h>

--- a/lang/qt/src/qgpgmesetprimaryuseridjob.cpp
+++ b/lang/qt/src/qgpgmesetprimaryuseridjob.cpp
@ -39,7 +39,7 @@

 #include "util.h"

-#include <engineinfo.h>
+#include <gpgme++/engineinfo.h>

 using namespace QGpgME;
 using namespace GpgME;
--- a/lang/qt/src/qgpgmesignarchivejob.cpp
+++ b/lang/qt/src/qgpgmesignarchivejob.cpp
@ -48,7 +48,7 @@

 #include <QFile>

-#include <data.h>
+#include <gpgme++/data.h>

 using namespace QGpgME;
 using namespace GpgME;
--- a/lang/qt/src/qgpgmesignarchivejob.h
+++ b/lang/qt/src/qgpgmesignarchivejob.h
@ -38,7 +38,7 @@

 #include "threadedjobmixin.h"

-#include <signingresult.h>
+#include <gpgme++/signingresult.h>

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmesignencryptarchivejob.cpp
+++ b/lang/qt/src/qgpgmesignencryptarchivejob.cpp
@ -48,7 +48,7 @@

 #include <QFile>

-#include <data.h>
+#include <gpgme++/data.h>

 using namespace QGpgME;
 using namespace GpgME;
--- a/lang/qt/src/qgpgmesignencryptarchivejob.h
+++ b/lang/qt/src/qgpgmesignencryptarchivejob.h
@ -38,8 +38,8 @@

 #include "threadedjobmixin.h"

-#include <encryptionresult.h>
-#include <signingresult.h>
+#include <gpgme++/encryptionresult.h>
+#include <gpgme++/signingresult.h>

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmesignencryptjob.cpp
+++ b/lang/qt/src/qgpgmesignencryptjob.cpp
@ -44,10 +44,10 @@
 #include "signencryptjob_p.h"
 #include "util.h"

-#include <context.h>
-#include <data.h>
-#include <exception.h>
-#include <key.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/exception.h>
+#include <gpgme++/key.h>

 #include <QBuffer>
 #include <QFileInfo>
--- a/lang/qt/src/qgpgmesignencryptjob.h
+++ b/lang/qt/src/qgpgmesignencryptjob.h
@ -39,21 +39,9 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "signingresult.h"
-#else
 #include <gpgme++/signingresult.h>
-#endif
-#ifdef BUILDING_QGPGME
-# include "encryptionresult.h"
-#else
 #include <gpgme++/encryptionresult.h>
-#endif
-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
 #include <gpgme++/key.h>
-#endif

 #include <utility>

--- a/lang/qt/src/qgpgmesignjob.cpp
+++ b/lang/qt/src/qgpgmesignjob.cpp
@ -42,9 +42,9 @@
 #include "signjob_p.h"
 #include "util.h"

-#include <context.h>
-#include <data.h>
-#include <signingresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/signingresult.h>

 #include <QBuffer>
 #include <QFile>
--- a/lang/qt/src/qgpgmesignjob.h
+++ b/lang/qt/src/qgpgmesignjob.h
@ -39,16 +39,8 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "signingresult.h"
-#else
 #include <gpgme++/signingresult.h>
-#endif
-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
 #include <gpgme++/key.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmesignkeyjob.cpp
+++ b/lang/qt/src/qgpgmesignkeyjob.cpp
@ -43,9 +43,9 @@

 #include "dataprovider.h"

-#include "context.h"
-#include "data.h"
-#include "gpgsignkeyeditinteractor.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/gpgsignkeyeditinteractor.h>

 #include "qgpgme_debug.h"

--- a/lang/qt/src/qgpgmetofupolicyjob.cpp
+++ b/lang/qt/src/qgpgmetofupolicyjob.cpp
@ -35,9 +35,9 @@

 #include "qgpgmetofupolicyjob.h"

-#include "context.h"
-#include "key.h"
-#include "tofuinfo.h"
+#include <gpgme++/context.h>
+#include <gpgme++/key.h>
+#include <gpgme++/tofuinfo.h>


 using namespace QGpgME;
--- a/lang/qt/src/qgpgmeverifydetachedjob.cpp
+++ b/lang/qt/src/qgpgmeverifydetachedjob.cpp
@ -44,9 +44,9 @@

 #include <QFile>

-#include <context.h>
-#include <data.h>
-#include <verificationresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/verificationresult.h>

 #include <cassert>

--- a/lang/qt/src/qgpgmeverifydetachedjob.h
+++ b/lang/qt/src/qgpgmeverifydetachedjob.h
@ -39,11 +39,7 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "verificationresult.h"
-#else
 #include <gpgme++/verificationresult.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmeverifyopaquejob.cpp
+++ b/lang/qt/src/qgpgmeverifyopaquejob.cpp
@ -42,9 +42,9 @@
 #include "util.h"
 #include "verifyopaquejob_p.h"

-#include <context.h>
-#include <data.h>
-#include <verificationresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/verificationresult.h>

 #include <QBuffer>
 #include <QFile>
--- a/lang/qt/src/qgpgmeverifyopaquejob.h
+++ b/lang/qt/src/qgpgmeverifyopaquejob.h
@ -39,11 +39,7 @@

 #include "threadedjobmixin.h"

-#ifdef BUILDING_QGPGME
-# include "verificationresult.h"
-#else
 #include <gpgme++/verificationresult.h>
-#endif

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmewkdlookupjob.cpp
+++ b/lang/qt/src/qgpgmewkdlookupjob.cpp
@ -39,9 +39,9 @@

 #include "qgpgme_debug.h"

-#include <context.h>
-#include <data.h>
-#include <defaultassuantransaction.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/defaultassuantransaction.h>

 #include <gpg-error.h>

--- a/lang/qt/src/qgpgmewkdrefreshjob.cpp
+++ b/lang/qt/src/qgpgmewkdrefreshjob.cpp
@ -42,7 +42,7 @@
 #include "qgpgmekeylistjob.h"
 #include "wkdrefreshjob_p.h"

-#include <context.h>
+#include <gpgme++/context.h>

 #include <memory>

--- a/lang/qt/src/qgpgmewkdrefreshjob.h
+++ b/lang/qt/src/qgpgmewkdrefreshjob.h
@ -37,7 +37,7 @@
 #include "threadedjobmixin.h"
 #include "wkdrefreshjob.h"

-#include <importresult.h>
+#include <gpgme++/importresult.h>

 namespace QGpgME
 {
--- a/lang/qt/src/qgpgmewkspublishjob.cpp
+++ b/lang/qt/src/qgpgmewkspublishjob.cpp
@ -35,8 +35,9 @@

 #include "qgpgmewkspublishjob.h"

-#include "context.h"
-#include "key.h"
+#include <gpgme++/context.h>
+#include <gpgme++/key.h>
+
 #include "util.h"

 #include <QFileInfo>
--- a/lang/qt/src/quickjob.h
+++ b/lang/qt/src/quickjob.h
@ -39,11 +39,7 @@

 #include <QDateTime>

-#ifdef BUILDING_QGPGME
-# include "key.h"
-#else
-# include <gpgme++/key.h>
-#endif
+#include <gpgme++/key.h>

 class QString;

--- a/lang/qt/src/signarchivejob.cpp
+++ b/lang/qt/src/signarchivejob.cpp
@ -38,7 +38,7 @@
 #include "signarchivejob.h"
 #include "signarchivejob_p.h"

-#include <engineinfo.h>
+#include <gpgme++/engineinfo.h>

 using namespace QGpgME;

--- a/lang/qt/src/signarchivejob.h
+++ b/lang/qt/src/signarchivejob.h
@ -36,11 +36,7 @@

 #include "job.h"

-#ifdef BUILDING_QGPGME
-# include "context.h"
-#else
-# include <gpgme++/context.h>
-#endif
+#include <gpgme++/context.h>

 namespace GpgME
 {
--- a/lang/qt/src/signencryptarchivejob.cpp
+++ b/lang/qt/src/signencryptarchivejob.cpp
@ -38,7 +38,7 @@
 #include "signencryptarchivejob.h"
 #include "signencryptarchivejob_p.h"

-#include <engineinfo.h>
+#include <gpgme++/engineinfo.h>

 using namespace QGpgME;

--- a/lang/qt/src/signencryptarchivejob.h
+++ b/lang/qt/src/signencryptarchivejob.h
@ -36,11 +36,7 @@

 #include "job.h"

-#ifdef BUILDING_QGPGME
-# include "context.h"
-#else
-# include <gpgme++/context.h>
-#endif
+#include <gpgme++/context.h>

 namespace GpgME
 {
--- a/lang/qt/src/signencryptjob.h
+++ b/lang/qt/src/signencryptjob.h
@ -40,13 +40,8 @@
 #include "job.h"
 #include "qgpgme_export.h"

-#ifdef BUILDING_QGPGME
-# include "global.h"
-# include "context.h"
-#else
-# include <gpgme++/global.h>
-# include <gpgme++/context.h>
-#endif
+#include <gpgme++/global.h>
+#include <gpgme++/context.h>

 #include <memory>
 #include <vector>
--- a/lang/qt/src/signencryptjob_p.h
+++ b/lang/qt/src/signencryptjob_p.h
@ -36,7 +36,7 @@

 #include "job_p.h"

-#include <key.h>
+#include <gpgme++/key.h>

 namespace QGpgME
 {
--- a/lang/qt/src/signjob.h
+++ b/lang/qt/src/signjob.h
@ -37,12 +37,7 @@

 #include "job.h"

-#ifdef BUILDING_QGPGME
-# include "global.h"
-#else
-# include <gpgme++/global.h>
-#endif
-
+#include <gpgme++/global.h>

 #include <vector>
 #include <memory>
--- a/lang/qt/src/signjob_p.h
+++ b/lang/qt/src/signjob_p.h
@ -36,7 +36,7 @@

 #include "job_p.h"

-#include <key.h>
+#include <gpgme++/key.h>

 namespace QGpgME
 {
--- a/lang/qt/src/threadedjobmixin.cpp
+++ b/lang/qt/src/threadedjobmixin.cpp
@ -40,7 +40,7 @@

 #include "dataprovider.h"

-#include "data.h"
+#include <gpgme++/data.h>

 #include <QString>
 #include <QStringList>
--- a/lang/qt/src/threadedjobmixin.h
+++ b/lang/qt/src/threadedjobmixin.h
@ -41,13 +41,8 @@
 #include <QString>
 #include <QIODevice>

-#ifdef BUILDING_QGPGME
-# include "context.h"
-# include "interfaces/progressprovider.h"
-#else
-# include <gpgme++/context.h>
-# include <gpgme++/interfaces/progressprovider.h>
-#endif
+#include <gpgme++/context.h>
+#include <gpgme++/interfaces/progressprovider.h>

 #include "job.h"

--- a/lang/qt/src/tofupolicyjob.h
+++ b/lang/qt/src/tofupolicyjob.h
@ -35,11 +35,7 @@

 #include "qgpgme_export.h"

-#ifdef BUILDING_QGPGME
-# include "tofuinfo.h"
-#else
-# include <gpgme++/tofuinfo.h>
-#endif
+#include <gpgme++/tofuinfo.h>

 namespace GpgME
 {
--- a/lang/qt/src/util.cpp
+++ b/lang/qt/src/util.cpp
@ -44,7 +44,7 @@
 #include <QFileInfo>
 #include <QRandomGenerator>

-#include <key.h>
+#include <gpgme++/key.h>

 #include <algorithm>
 #include <functional>
--- a/lang/qt/src/wkdlookupresult.cpp
+++ b/lang/qt/src/wkdlookupresult.cpp
@ -37,7 +37,7 @@

 #include "wkdlookupresult.h"

-#include <data.h>
+#include <gpgme++/data.h>

 using namespace QGpgME;
 using namespace GpgME;
--- a/lang/qt/src/wkdlookupresult.h
+++ b/lang/qt/src/wkdlookupresult.h
@ -36,11 +36,7 @@

 #include "qgpgme_export.h"

-#ifdef BUILDING_QGPGME
-# include <result.h>
-#else
-# include <gpgme++/result.h>
-#endif
+#include <gpgme++/result.h>

 #include <memory>

--- a/lang/qt/src/wkdrefreshjob_p.h
+++ b/lang/qt/src/wkdrefreshjob_p.h
@ -36,7 +36,7 @@

 #include "job_p.h"

-#include <key.h>
+#include <gpgme++/key.h>

 namespace QGpgME
 {
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@ -52,7 +52,7 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgme.la \
        ../../../src/libgpgme.la @GPGME_QT5_LIBS@ @GPG_ERROR_LIBS@ \
        @GPGME_QT5TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++

-AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \
+AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_builddir)/lang/cpp/src \
              -I$(top_builddir)/src \
              @GPG_ERROR_CFLAGS@ @GPGME_QT5_CFLAGS@ @GPG_ERROR_CFLAGS@ \
              @LIBASSUAN_CFLAGS@ @GPGME_QT5TEST_CFLAGS@ -DBUILDING_QGPGME \
@ -63,7 +63,7 @@ LDADD = ../../cpp/src/libgpgmepp.la ../src/libqgpgmeqt6.la \
        ../../../src/libgpgme.la @GPGME_QT6_LIBS@ @GPG_ERROR_LIBS@ \
        @GPGME_QT6TEST_LIBS@ @LDADD_FOR_TESTS_KLUDGE@ -lstdc++

-AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_srcdir)/lang/cpp/src \
+AM_CPPFLAGS = -I$(top_srcdir)/lang/qt/src -I$(top_builddir)/lang/cpp/src \
              -I$(top_builddir)/src \
              @GPG_ERROR_CFLAGS@ @GPGME_QT6_CFLAGS@ @GPG_ERROR_CFLAGS@ \
              @LIBASSUAN_CFLAGS@ @GPGME_QT6TEST_CFLAGS@ -DBUILDING_QGPGME \
--- a/lang/qt/tests/run-decryptverifyarchivejob.cpp
+++ b/lang/qt/tests/run-decryptverifyarchivejob.cpp
@ -41,9 +41,9 @@
 #include <QCoreApplication>
 #include <QDebug>

-#include <context.h>
-#include <decryptionresult.h>
-#include <verificationresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/decryptionresult.h>
+#include <gpgme++/verificationresult.h>

 #include <iostream>

--- a/lang/qt/tests/run-decryptverifyjob.cpp
+++ b/lang/qt/tests/run-decryptverifyjob.cpp
@ -43,9 +43,9 @@
 #include <QFile>
 #include <QTimer>

-#include <context.h>
-#include <decryptionresult.h>
-#include <verificationresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/decryptionresult.h>
+#include <gpgme++/verificationresult.h>

 #include <iostream>

--- a/lang/qt/tests/run-encryptarchivejob.cpp
+++ b/lang/qt/tests/run-encryptarchivejob.cpp
@ -46,9 +46,9 @@
 #include <QFileInfo>
 #include <QTimer>

-#include <context.h>
-#include <encryptionresult.h>
-#include <signingresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/encryptionresult.h>
+#include <gpgme++/signingresult.h>

 #include <iostream>

--- a/Show More
+++ b/Show More