[Pkg-gnupg-commit] [gpgme] 200/412: Revert "Qt: More robust lookup of Cpp's context.h"

[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 7a8c04f66d382dc49d962ad18c46d7ad332ccc0f
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jul 6 11:22:10 2016 +0200

    Revert "Qt: More robust lookup of Cpp's context.h"
    
    * lang/qt/src/threadedjobmixin.h: Revert using full path
    for context.h
    
    --
    This reverts commit 47bfbc9026b49b9918359af5fcc1621aab0d1065 as
    it causes problems depending on the include path. The proper
    fix will be to ensure that cpp/src is included before gpgme/src.
---
 lang/qt/src/threadedjobmixin.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
index b29b827..62d7f1c 100644
--- a/lang/qt/src/threadedjobmixin.h
+++ b/lang/qt/src/threadedjobmixin.h
@@ -41,7 +41,7 @@
 #include <QIODevice>
 
 #ifdef BUILDING_QGPGME
-# include "lang/cpp/src/context.h"
+# include "context.h"
 # include "interfaces/progressprovider.h"
 #else
 # include <gpgme++/context.h>

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