From 9c03bde06be97403a8c392a3befc6c203bcdce6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
Date: Mon, 17 Jan 2022 14:41:17 +0100
Subject: [PATCH] qt: Fix build without installed GpgME++ headers

* lang/qt/src/importjob.h, lang/qt/src/wkdlookupresult.h: Include
headers of GpgME++ without "gpgme++/" prefix when building QGpgme.
* lang/qt/src/qgpgmeimportjob.cpp, lang/qt/src/qgpgmewkdlookupjob.cpp,
lang/qt/src/wkdlookupresult.cpp, lang/qt/tests/t-import.cpp: Include
headers of GpgME++ without "gpgme++/" prefix.
--
---
 lang/qt/src/importjob.h            | 6 +++++-
 lang/qt/src/qgpgmeimportjob.cpp    | 6 +++---
 lang/qt/src/qgpgmewkdlookupjob.cpp | 6 +++---
 lang/qt/src/wkdlookupresult.cpp    | 2 +-
 lang/qt/src/wkdlookupresult.h      | 6 +++++-
 lang/qt/tests/t-import.cpp         | 2 +-
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/lang/qt/src/importjob.h b/lang/qt/src/importjob.h
index 03b0bcf9..24589852 100644
--- a/lang/qt/src/importjob.h
+++ b/lang/qt/src/importjob.h
@@ -40,7 +40,11 @@
 
 #include <QtCore/QByteArray>
 
-#include <gpgme++/key.h>
+#ifdef BUILDING_QGPGME
+# include <key.h>
+#else
+# include <gpgme++/key.h>
+#endif
 
 namespace GpgME
 {
diff --git a/lang/qt/src/qgpgmeimportjob.cpp b/lang/qt/src/qgpgmeimportjob.cpp
index ebd8a269..d609c5f1 100644
--- a/lang/qt/src/qgpgmeimportjob.cpp
+++ b/lang/qt/src/qgpgmeimportjob.cpp
@@ -40,9 +40,9 @@
 
 #include "dataprovider.h"
 
-#include <gpgme++/context.h>
-#include <gpgme++/data.h>
-#include <gpgme++/key.h>
+#include <context.h>
+#include <data.h>
+#include <key.h>
 
 using namespace QGpgME;
 using namespace GpgME;
diff --git a/lang/qt/src/qgpgmewkdlookupjob.cpp b/lang/qt/src/qgpgmewkdlookupjob.cpp
index b8622167..266da0d5 100644
--- a/lang/qt/src/qgpgmewkdlookupjob.cpp
+++ b/lang/qt/src/qgpgmewkdlookupjob.cpp
@@ -39,9 +39,9 @@
 
 #include "qgpgme_debug.h"
 
-#include <gpgme++/context.h>
-#include <gpgme++/data.h>
-#include <gpgme++/defaultassuantransaction.h>
+#include <context.h>
+#include <data.h>
+#include <defaultassuantransaction.h>
 
 #include <gpg-error.h>
 
diff --git a/lang/qt/src/wkdlookupresult.cpp b/lang/qt/src/wkdlookupresult.cpp
index ac1a89e9..c44b7370 100644
--- a/lang/qt/src/wkdlookupresult.cpp
+++ b/lang/qt/src/wkdlookupresult.cpp
@@ -37,7 +37,7 @@
 
 #include "wkdlookupresult.h"
 
-#include <gpgme++/data.h>
+#include <data.h>
 
 using namespace QGpgME;
 using namespace GpgME;
diff --git a/lang/qt/src/wkdlookupresult.h b/lang/qt/src/wkdlookupresult.h
index 5696fb6d..1e91d055 100644
--- a/lang/qt/src/wkdlookupresult.h
+++ b/lang/qt/src/wkdlookupresult.h
@@ -36,7 +36,11 @@
 
 #include "qgpgme_export.h"
 
-#include <gpgme++/result.h>
+#ifdef BUILDING_QGPGME
+# include <result.h>
+#else
+# include <gpgme++/result.h>
+#endif
 
 #include <memory>
 
diff --git a/lang/qt/tests/t-import.cpp b/lang/qt/tests/t-import.cpp
index 456d7d64..33e242f0 100644
--- a/lang/qt/tests/t-import.cpp
+++ b/lang/qt/tests/t-import.cpp
@@ -41,7 +41,7 @@
 #include "protocol.h"
 #include "importjob.h"
 
-#include <gpgme++/importresult.h>
+#include <importresult.h>
 
 #include <QDebug>
 #include <QSignalSpy>