diff options
| author | Ingo Klöcker <[email protected]> | 2022-01-17 13:41:17 +0000 |
|---|---|---|
| committer | Ingo Klöcker <[email protected]> | 2022-01-17 13:41:17 +0000 |
| commit | 9c03bde06be97403a8c392a3befc6c203bcdce6d (patch) | |
| tree | d87c353767af75df16053ff8ba4b30782bb3567c /lang/qt/src | |
| parent | tests: Fix generation of keys without expiration (diff) | |
| download | gpgme-9c03bde06be97403a8c392a3befc6c203bcdce6d.tar.gz gpgme-9c03bde06be97403a8c392a3befc6c203bcdce6d.zip | |
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.
--
Diffstat (limited to 'lang/qt/src')
| -rw-r--r-- | lang/qt/src/importjob.h | 6 | ||||
| -rw-r--r-- | lang/qt/src/qgpgmeimportjob.cpp | 6 | ||||
| -rw-r--r-- | lang/qt/src/qgpgmewkdlookupjob.cpp | 6 | ||||
| -rw-r--r-- | lang/qt/src/wkdlookupresult.cpp | 2 | ||||
| -rw-r--r-- | lang/qt/src/wkdlookupresult.h | 6 |
5 files changed, 17 insertions, 9 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> |