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

35 files changed, 88 insertions, 86 deletions

diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index 878e32bd..2072e049 100644
--- 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 \
diff --git a/lang/qt/tests/run-decryptverifyarchivejob.cpp b/lang/qt/tests/run-decryptverifyarchivejob.cpp
index 59073458..38cf6b86 100644
--- 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>
 
diff --git a/lang/qt/tests/run-decryptverifyjob.cpp b/lang/qt/tests/run-decryptverifyjob.cpp
index 2ddfb1ae..4d2e947c 100644
--- 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>
 
diff --git a/lang/qt/tests/run-encryptarchivejob.cpp b/lang/qt/tests/run-encryptarchivejob.cpp
index c1d617fb..2d9c09a3 100644
--- 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>
 
diff --git a/lang/qt/tests/run-encryptjob.cpp b/lang/qt/tests/run-encryptjob.cpp
index c3d6c9ee..47e6e248 100644
--- a/lang/qt/tests/run-encryptjob.cpp
+++ b/lang/qt/tests/run-encryptjob.cpp
@@ -44,9 +44,9 @@
 #include <QFile>
 #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>
 
diff --git a/lang/qt/tests/run-exportjob.cpp b/lang/qt/tests/run-exportjob.cpp
index 40072c85..6cb43c22 100644
--- a/lang/qt/tests/run-exportjob.cpp
+++ b/lang/qt/tests/run-exportjob.cpp
@@ -37,7 +37,7 @@
 #include <exportjob.h>
 #include <protocol.h>
 
-#include <context.h>
+#include <gpgme++/context.h>
 
 #include <QCoreApplication>
 
diff --git a/lang/qt/tests/run-importjob.cpp b/lang/qt/tests/run-importjob.cpp
index 0ae92b09..a0b9ffc1 100644
--- a/lang/qt/tests/run-importjob.cpp
+++ b/lang/qt/tests/run-importjob.cpp
@@ -36,7 +36,7 @@
 
 #include <debug.h>
 #include <importjob.h>
-#include <importresult.h>
+#include <gpgme++/importresult.h>
 #include <protocol.h>
 
 #include <QFile>
diff --git a/lang/qt/tests/run-keyformailboxjob.cpp b/lang/qt/tests/run-keyformailboxjob.cpp
index dc3f9671..8ec0c5b3 100644
--- a/lang/qt/tests/run-keyformailboxjob.cpp
+++ b/lang/qt/tests/run-keyformailboxjob.cpp
@@ -38,8 +38,8 @@
 #include "keylistjob.h"
 #include "protocol.h"
 
-#include "key.h"
-#include "keylistresult.h"
+#include <gpgme++/key.h>
+#include <gpgme++/keylistresult.h>
 
 #include <QDebug>
 
diff --git a/lang/qt/tests/run-receivekeysjob.cpp b/lang/qt/tests/run-receivekeysjob.cpp
index 0dc1575b..6bfe047f 100644
--- a/lang/qt/tests/run-receivekeysjob.cpp
+++ b/lang/qt/tests/run-receivekeysjob.cpp
@@ -34,7 +34,7 @@
  #include "config.h"
 #endif
 
-#include <importresult.h>
+#include <gpgme++/importresult.h>
 #include <protocol.h>
 #include <receivekeysjob.h>
 
diff --git a/lang/qt/tests/run-refreshkeysjob.cpp b/lang/qt/tests/run-refreshkeysjob.cpp
index 940c0c77..e2bf7d1f 100644
--- a/lang/qt/tests/run-refreshkeysjob.cpp
+++ b/lang/qt/tests/run-refreshkeysjob.cpp
@@ -41,8 +41,8 @@
 #include <QCoreApplication>
 #include <QDebug>
 
-#include <context.h>
-#include <importresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/importresult.h>
 
 #include <iostream>
 
diff --git a/lang/qt/tests/run-signarchivejob.cpp b/lang/qt/tests/run-signarchivejob.cpp
index c7e1fee7..c832372a 100644
--- a/lang/qt/tests/run-signarchivejob.cpp
+++ b/lang/qt/tests/run-signarchivejob.cpp
@@ -45,8 +45,8 @@
 #include <QFileInfo>
 #include <QTimer>
 
-#include <context.h>
-#include <signingresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/signingresult.h>
 
 #include <iostream>
 
diff --git a/lang/qt/tests/run-signjob.cpp b/lang/qt/tests/run-signjob.cpp
index c1342b66..a85c6034 100644
--- a/lang/qt/tests/run-signjob.cpp
+++ b/lang/qt/tests/run-signjob.cpp
@@ -43,8 +43,8 @@
 #include <QFile>
 #include <QTimer>
 
-#include <context.h>
-#include <signingresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/signingresult.h>
 
 #include <iostream>
 
diff --git a/lang/qt/tests/run-verifydetachedjob.cpp b/lang/qt/tests/run-verifydetachedjob.cpp
index 6ee21109..65274383 100644
--- a/lang/qt/tests/run-verifydetachedjob.cpp
+++ b/lang/qt/tests/run-verifydetachedjob.cpp
@@ -42,8 +42,8 @@
 #include <QDebug>
 #include <QFile>
 
-#include <context.h>
-#include <verificationresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/verificationresult.h>
 
 #include <iostream>
 
diff --git a/lang/qt/tests/run-verifyopaquejob.cpp b/lang/qt/tests/run-verifyopaquejob.cpp
index 37466bd3..080c988c 100644
--- a/lang/qt/tests/run-verifyopaquejob.cpp
+++ b/lang/qt/tests/run-verifyopaquejob.cpp
@@ -43,8 +43,8 @@
 #include <QFile>
 #include <QTimer>
 
-#include <context.h>
-#include <verificationresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/verificationresult.h>
 
 #include <iostream>
 
diff --git a/lang/qt/tests/run-wkdrefreshjob.cpp b/lang/qt/tests/run-wkdrefreshjob.cpp
index c75718e6..85110b0d 100644
--- a/lang/qt/tests/run-wkdrefreshjob.cpp
+++ b/lang/qt/tests/run-wkdrefreshjob.cpp
@@ -42,8 +42,8 @@
 #include <QCoreApplication>
 #include <QDebug>
 
-#include <context.h>
-#include <importresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/importresult.h>
 
 #include <iostream>
 
diff --git a/lang/qt/tests/t-addexistingsubkey.cpp b/lang/qt/tests/t-addexistingsubkey.cpp
index c0eee57b..df620ddb 100644
--- a/lang/qt/tests/t-addexistingsubkey.cpp
+++ b/lang/qt/tests/t-addexistingsubkey.cpp
@@ -41,9 +41,9 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#include "context.h"
-#include "data.h"
-#include "engineinfo.h"
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
+#include <gpgme++/engineinfo.h>
 
 #include <algorithm>
 
diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
index 3da74d46..54a54aeb 100644
--- a/lang/qt/tests/t-changeexpiryjob.cpp
+++ b/lang/qt/tests/t-changeexpiryjob.cpp
@@ -37,8 +37,8 @@
 #include "t-support.h"
 
 #include "changeexpiryjob.h"
-#include "context.h"
-#include "engineinfo.h"
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
 #include "protocol.h"
 
 #include <QSignalSpy>
diff --git a/lang/qt/tests/t-config.cpp b/lang/qt/tests/t-config.cpp
index b84dbfd4..2f73b9a6 100644
--- a/lang/qt/tests/t-config.cpp
+++ b/lang/qt/tests/t-config.cpp
@@ -39,7 +39,7 @@
 #include "t-support.h"
 #include "protocol.h"
 #include "cryptoconfig.h"
-#include "engineinfo.h"
+#include <gpgme++/engineinfo.h>
 
 #include <unistd.h>
 
diff --git a/lang/qt/tests/t-decryptverify.cpp b/lang/qt/tests/t-decryptverify.cpp
index 5522a604..9df10933 100644
--- a/lang/qt/tests/t-decryptverify.cpp
+++ b/lang/qt/tests/t-decryptverify.cpp
@@ -43,9 +43,9 @@
 #include <QDebug>
 #include <QTest>
 
-#include <decryptionresult.h>
-#include <key.h>
-#include <verificationresult.h>
+#include <gpgme++/decryptionresult.h>
+#include <gpgme++/key.h>
+#include <gpgme++/verificationresult.h>
 
 using namespace QGpgME;
 using namespace GpgME;
diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp
index 35b9bbf9..aac49a4b 100644
--- a/lang/qt/tests/t-encrypt.cpp
+++ b/lang/qt/tests/t-encrypt.cpp
@@ -41,14 +41,14 @@
 #include "keylistjob.h"
 #include "encryptjob.h"
 #include "signencryptjob.h"
-#include "signingresult.h"
+#include <gpgme++/signingresult.h>
 #include "encryptjob.h"
-#include "encryptionresult.h"
-#include "decryptionresult.h"
+#include <gpgme++/encryptionresult.h>
+#include <gpgme++/decryptionresult.h>
 #include "decryptjob.h"
 #include "qgpgmebackend.h"
-#include "keylistresult.h"
-#include "engineinfo.h"
+#include <gpgme++/keylistresult.h>
+#include <gpgme++/engineinfo.h>
 #include "verifyopaquejob.h"
 #include "t-support.h"
 
diff --git a/lang/qt/tests/t-import.cpp b/lang/qt/tests/t-import.cpp
index 1c0040c9..be17a03c 100644
--- a/lang/qt/tests/t-import.cpp
+++ b/lang/qt/tests/t-import.cpp
@@ -36,12 +36,12 @@
 
 #include "t-support.h"
 
-#include "context.h"
-#include "engineinfo.h"
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
 #include "protocol.h"
 #include "importjob.h"
 
-#include <importresult.h>
+#include <gpgme++/importresult.h>
 
 #include <QDebug>
 #include <QSignalSpy>
diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp
index 80781d2f..75bc4120 100644
--- a/lang/qt/tests/t-keylist.cpp
+++ b/lang/qt/tests/t-keylist.cpp
@@ -41,10 +41,10 @@
 #include "keylistjob.h"
 #include "listallkeysjob.h"
 #include "qgpgmebackend.h"
-#include "keylistresult.h"
+#include <gpgme++/keylistresult.h>
 
-#include "context.h"
-#include "engineinfo.h"
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
 
 #include <memory>
 
diff --git a/lang/qt/tests/t-keylocate.cpp b/lang/qt/tests/t-keylocate.cpp
index d3143da2..88062f50 100644
--- a/lang/qt/tests/t-keylocate.cpp
+++ b/lang/qt/tests/t-keylocate.cpp
@@ -39,8 +39,8 @@
 #include <QTemporaryDir>
 #include "keylistjob.h"
 #include "protocol.h"
-#include "keylistresult.h"
-#include "engineinfo.h"
+#include <gpgme++/keylistresult.h>
+#include <gpgme++/engineinfo.h>
 
 #include "t-support.h"
 
diff --git a/lang/qt/tests/t-ownertrust.cpp b/lang/qt/tests/t-ownertrust.cpp
index 31d22479..bb2df08a 100644
--- a/lang/qt/tests/t-ownertrust.cpp
+++ b/lang/qt/tests/t-ownertrust.cpp
@@ -39,7 +39,7 @@
 #include <QSignalSpy>
 #include "keylistjob.h"
 #include "protocol.h"
-#include "keylistresult.h"
+#include <gpgme++/keylistresult.h>
 #include "changeownertrustjob.h"
 
 #include "t-support.h"
diff --git a/lang/qt/tests/t-remarks.cpp b/lang/qt/tests/t-remarks.cpp
index f8aebd31..86a5f6a5 100644
--- a/lang/qt/tests/t-remarks.cpp
+++ b/lang/qt/tests/t-remarks.cpp
@@ -42,8 +42,8 @@
 #include "keylistjob.h"
 #include "protocol.h"
 #include "signkeyjob.h"
-#include "context.h"
-#include "engineinfo.h"
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
 
 #include "t-support.h"
 
diff --git a/lang/qt/tests/t-revokekey.cpp b/lang/qt/tests/t-revokekey.cpp
index 83d5e717..4d8b0ca5 100644
--- a/lang/qt/tests/t-revokekey.cpp
+++ b/lang/qt/tests/t-revokekey.cpp
@@ -44,8 +44,8 @@
 #include <QSignalSpy>
 #include <QTest>
 
-#include <context.h>
-#include <data.h>
+#include <gpgme++/context.h>
+#include <gpgme++/data.h>
 
 #include <algorithm>
 
diff --git a/lang/qt/tests/t-setprimaryuserid.cpp b/lang/qt/tests/t-setprimaryuserid.cpp
index c1bd1069..e57d1c6e 100644
--- a/lang/qt/tests/t-setprimaryuserid.cpp
+++ b/lang/qt/tests/t-setprimaryuserid.cpp
@@ -38,9 +38,9 @@
 #include <keylistjob.h>
 #include <protocol.h>
 
-#include <context.h>
-#include <engineinfo.h>
-#include <keylistresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
+#include <gpgme++/keylistresult.h>
 
 using namespace QGpgME;
 using namespace GpgME;
diff --git a/lang/qt/tests/t-support.cpp b/lang/qt/tests/t-support.cpp
index 6db082fd..48ad0cd9 100644
--- a/lang/qt/tests/t-support.cpp
+++ b/lang/qt/tests/t-support.cpp
@@ -48,9 +48,9 @@
 #include <QDir>
 #include <QSignalSpy>
 
-#include "context.h"
-#include "engineinfo.h"
-#include "importresult.h"
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
+#include <gpgme++/importresult.h>
 
 using namespace GpgME;
 using namespace QGpgME;
diff --git a/lang/qt/tests/t-support.h b/lang/qt/tests/t-support.h
index fd7be44a..eb4ba57d 100644
--- a/lang/qt/tests/t-support.h
+++ b/lang/qt/tests/t-support.h
@@ -32,7 +32,7 @@
 #ifndef T_SUPPORT_H
 #define T_SUPPORT_H
 
-#include "interfaces/passphraseprovider.h"
+#include <gpgme++/interfaces/passphraseprovider.h>
 #include <QObject>
 #include <QTest>
 
diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp
index c8d35ada..b495ec5c 100644
--- a/lang/qt/tests/t-tofuinfo.cpp
+++ b/lang/qt/tests/t-tofuinfo.cpp
@@ -39,20 +39,21 @@
 #include <QSignalSpy>
 
 #include "protocol.h"
-#include "tofuinfo.h"
+#include <gpgme++/tofuinfo.h>
 #include "tofupolicyjob.h"
 #include "verifyopaquejob.h"
-#include "verificationresult.h"
-#include "signingresult.h"
+#include <gpgme++/verificationresult.h>
+#include <gpgme++/signingresult.h>
 #include "importjob.h"
-#include "importresult.h"
+#include <gpgme++/importresult.h>
 #include "keylistjob.h"
-#include "keylistresult.h"
+#include <gpgme++/keylistresult.h>
 #include "signjob.h"
-#include "key.h"
+#include <gpgme++/key.h>
+
 #include "t-support.h"
-#include "engineinfo.h"
-#include "context.h"
+#include <gpgme++/engineinfo.h>
+#include <gpgme++/context.h>
 #include <iostream>
 
 using namespace QGpgME;
diff --git a/lang/qt/tests/t-trustsignatures.cpp b/lang/qt/tests/t-trustsignatures.cpp
index b4baea4e..356b49b7 100644
--- a/lang/qt/tests/t-trustsignatures.cpp
+++ b/lang/qt/tests/t-trustsignatures.cpp
@@ -36,8 +36,8 @@
 
 #include "t-support.h"
 
-#include "context.h"
-#include "engineinfo.h"
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
 #include "protocol.h"
 #include "signkeyjob.h"
 
diff --git a/lang/qt/tests/t-various.cpp b/lang/qt/tests/t-various.cpp
index b7e43a6a..6759f3b6 100644
--- a/lang/qt/tests/t-various.cpp
+++ b/lang/qt/tests/t-various.cpp
@@ -40,11 +40,11 @@
 #include <QTemporaryDir>
 #include "keylistjob.h"
 #include "protocol.h"
-#include "keylistresult.h"
-#include "context.h"
-#include "engineinfo.h"
+#include <gpgme++/keylistresult.h>
+#include <gpgme++/context.h>
+#include <gpgme++/engineinfo.h>
 #include "dn.h"
-#include "data.h"
+#include <gpgme++/data.h>
 #include "dataprovider.h"
 #include "signkeyjob.h"
 
diff --git a/lang/qt/tests/t-verify.cpp b/lang/qt/tests/t-verify.cpp
index 0dbecf79..f1bba08f 100644
--- a/lang/qt/tests/t-verify.cpp
+++ b/lang/qt/tests/t-verify.cpp
@@ -40,8 +40,9 @@
 #include "protocol.h"
 
 #include "verifyopaquejob.h"
-#include "verificationresult.h"
-#include "key.h"
+#include <gpgme++/verificationresult.h>
+#include <gpgme++/key.h>
+
 #include "t-support.h"
 
 using namespace QGpgME;
diff --git a/lang/qt/tests/t-wkdlookup.cpp b/lang/qt/tests/t-wkdlookup.cpp
index 5c2816cf..03b7823a 100644
--- a/lang/qt/tests/t-wkdlookup.cpp
+++ b/lang/qt/tests/t-wkdlookup.cpp
@@ -35,8 +35,8 @@
 
 #include "t-support.h"
 
-#include "data.h"
-#include "engineinfo.h"
+#include <gpgme++/data.h>
+#include <gpgme++/engineinfo.h>
 #include "protocol.h"
 #include "wkdlookupjob.h"
 #include "wkdlookupresult.h"
diff --git a/lang/qt/tests/t-wkspublish.cpp b/lang/qt/tests/t-wkspublish.cpp
index 618f0b48..cb75d149 100644
--- a/lang/qt/tests/t-wkspublish.cpp
+++ b/lang/qt/tests/t-wkspublish.cpp
@@ -39,11 +39,11 @@
 #include <QTemporaryDir>
 #include "wkspublishjob.h"
 #include "keygenerationjob.h"
-#include "keygenerationresult.h"
+#include <gpgme++/keygenerationresult.h>
 #include "importjob.h"
-#include "importresult.h"
+#include <gpgme++/importresult.h>
 #include "protocol.h"
-#include "engineinfo.h"
+#include <gpgme++/engineinfo.h>
 
 #include "t-support.h"