From 31ebc4f47a990e65e9872d8e7251bee5f22153d7 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Thu, 26 Apr 2018 21:38:26 +0200 Subject: Another qgpgme dependency gone --- .../src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp b/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp index 7e0e0d04..356c0821 100644 --- a/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp +++ b/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp @@ -19,9 +19,6 @@ #include -#include -#include -#include #include #include @@ -148,10 +145,14 @@ public Q_SLOTS: mResetGpgmeEngine = false; mModifiedEnv.clear(); { - QGpgME::openpgp(); // We need to intialize it, otherwise ctx will be a nullpointer - const GpgME::Context *ctx = GpgME::Context::createForProtocol(GpgME::Protocol::OpenPGP); - const auto engineinfo = ctx->engineInfo(); - mGpgmeEngine_fname = engineinfo.fileName(); + + gpgme_check_version(0); + gpgme_ctx_t ctx = 0; + gpgme_new(&ctx); + gpgme_set_protocol(ctx, GPGME_PROTOCOL_OpenPGP); + gpgme_engine_info_t info = gpgme_ctx_get_engine_info(ctx); + mGpgmeEngine_fname = info->file_name; + gpgme_release(ctx); } mEnv = QProcessEnvironment::systemEnvironment(); unsetEnv("GNUPGHOME"); -- cgit v1.2.3