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

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

lang/qt/src/qgpgmeimportjob.cpp

@@ -40,9 +40,9 @@
 
 #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 GpgME;

lang/qt/src/qgpgmewkdlookupjob.cpp

@@ -39,9 +39,9 @@
 
 #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>
 

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;

lang/qt/src/wkdlookupresult.h

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

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>