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

Daniel Kahn Gillmor dkg at fifthhorseman.net
Thu Sep 22 21:26:46 UTC 2016


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

dkg pushed a commit to branch master
in repository gpgme.

commit 47bfbc9026b49b9918359af5fcc1621aab0d1065
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 5 22:10:18 2016 +0200

    Qt: More robust lookup of Cpp's context.h
    
    * lang/qt/src/threadedjobmixin.h: When building qgpgme look for
    context.h in the full cpp subdirectory.
    
    --
    Gpgme core also contains a context.h that can lead to confusion
    otherwise.
---
 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 62d7f1c..b29b827 100644
--- a/lang/qt/src/threadedjobmixin.h
+++ b/lang/qt/src/threadedjobmixin.h
@@ -41,7 +41,7 @@
 #include <QIODevice>
 
 #ifdef BUILDING_QGPGME
-# include "context.h"
+# include "lang/cpp/src/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



More information about the Pkg-gnupg-commit mailing list