[Pkg-gnupg-commit] [gpgme] 321/412: qt: Add missing header redirection

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit 8a39a595eb802b80a6ad756b0ee8939e9733e86f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Sep 5 10:44:41 2016 +0200

    qt: Add missing header redirection
    
    * lang/qt/src/keyformailboxjob.h,
    lang/qt/src/qgpgmekeyformailboxjob.h: Fix includes.
    
    --
    This ensures that when building qgpgme you do not need an installed
    gpgme++.
---
 lang/qt/src/keyformailboxjob.h       | 7 ++++++-
 lang/qt/src/qgpgmekeyformailboxjob.h | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lang/qt/src/keyformailboxjob.h b/lang/qt/src/keyformailboxjob.h
index 9e76df5..d8b6c6b 100644
--- a/lang/qt/src/keyformailboxjob.h
+++ b/lang/qt/src/keyformailboxjob.h
@@ -36,7 +36,12 @@
 
 #include "job.h"
 
-#include <gpgme++/key.h>
+#ifdef BUILDING_QGPGME
+# include "key.h"
+#else
+# include <gpgme++/key.h>
+#endif
+
 namespace GpgME
 {
 class Error;
diff --git a/lang/qt/src/qgpgmekeyformailboxjob.h b/lang/qt/src/qgpgmekeyformailboxjob.h
index 02a16d3..8ac2c1f 100644
--- a/lang/qt/src/qgpgmekeyformailboxjob.h
+++ b/lang/qt/src/qgpgmekeyformailboxjob.h
@@ -38,8 +38,13 @@
 
 #include "threadedjobmixin.h"
 
-#include <gpgme++/keylistresult.h>
-#include <gpgme++/key.h>
+#ifdef BUILDING_QGPGME
+# include "keylistresult.h"
+# include "key.h"
+#else
+# include <gpgme++/keylistresult.h>
+# include <gpgme++/key.h>
+#endif
 
 namespace QGpgME
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git