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.
--
This commit is contained in:
Ingo Klöcker 2022-01-17 14:41:17 +01:00
parent e16729edcb
commit 9c03bde06b
6 changed files with 18 additions and 10 deletions

View File

@ -40,7 +40,11 @@
#include <QtCore/QByteArray> #include <QtCore/QByteArray>
#include <gpgme++/key.h> #ifdef BUILDING_QGPGME
# include <key.h>
#else
# include <gpgme++/key.h>
#endif
namespace GpgME namespace GpgME
{ {

View File

@ -40,9 +40,9 @@
#include "dataprovider.h" #include "dataprovider.h"
#include <gpgme++/context.h> #include <context.h>
#include <gpgme++/data.h> #include <data.h>
#include <gpgme++/key.h> #include <key.h>
using namespace QGpgME; using namespace QGpgME;
using namespace GpgME; using namespace GpgME;

View File

@ -39,9 +39,9 @@
#include "qgpgme_debug.h" #include "qgpgme_debug.h"
#include <gpgme++/context.h> #include <context.h>
#include <gpgme++/data.h> #include <data.h>
#include <gpgme++/defaultassuantransaction.h> #include <defaultassuantransaction.h>
#include <gpg-error.h> #include <gpg-error.h>

View File

@ -37,7 +37,7 @@
#include "wkdlookupresult.h" #include "wkdlookupresult.h"
#include <gpgme++/data.h> #include <data.h>
using namespace QGpgME; using namespace QGpgME;
using namespace GpgME; using namespace GpgME;

View File

@ -36,7 +36,11 @@
#include "qgpgme_export.h" #include "qgpgme_export.h"
#include <gpgme++/result.h> #ifdef BUILDING_QGPGME
# include <result.h>
#else
# include <gpgme++/result.h>
#endif
#include <memory> #include <memory>

View File

@ -41,7 +41,7 @@
#include "protocol.h" #include "protocol.h"
#include "importjob.h" #include "importjob.h"
#include <gpgme++/importresult.h> #include <importresult.h>
#include <QDebug> #include <QDebug>
#include <QSignalSpy> #include <QSignalSpy>