diff options
| author | Andre Heinecke <[email protected]> | 2016-04-03 09:22:19 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2016-04-03 09:27:44 +0000 |
| commit | 7071b2a9c00b85d434d01b6166269ebf48b01b81 (patch) | |
| tree | 4c281fd89d9e77d3225cef6568255eb43b7a11ec /lang/qt/src/qgpgmebackend.cpp | |
| parent | Add additional include path in config files (diff) | |
| download | gpgme-7071b2a9c00b85d434d01b6166269ebf48b01b81.tar.gz gpgme-7071b2a9c00b85d434d01b6166269ebf48b01b81.zip | |
Qt: Only use GpgME based config class
* lang/qt/src/qgpgmecryptoconfig.cpp,
lang/qt/src/qgpgmecryptoconfig.h: Removed.
* lang/qt/src/qgpgmebackend.cpp: Return newcryptoconfig.
--
The GpgME based config class is the way forward and the
old class was using KDE Code. Probably needs some bugfixes
as previously the new class was only used for Windows CE
Diffstat (limited to 'lang/qt/src/qgpgmebackend.cpp')
| -rw-r--r-- | lang/qt/src/qgpgmebackend.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lang/qt/src/qgpgmebackend.cpp b/lang/qt/src/qgpgmebackend.cpp index ac771241..1167daee 100644 --- a/lang/qt/src/qgpgmebackend.cpp +++ b/lang/qt/src/qgpgmebackend.cpp @@ -33,7 +33,6 @@ #include "qgpgmebackend.h" -#include "qgpgmecryptoconfig.h" #include "qgpgmenewcryptoconfig.h" #include "qgpgmekeygenerationjob.h" @@ -408,14 +407,9 @@ QString QGpgME::QGpgMEBackend::displayName() const QGpgME::CryptoConfig *QGpgME::QGpgMEBackend::config() const { if (!mCryptoConfig) { -#ifdef _WIN32_WCE // for now... if (GpgME::hasFeature(GpgME::GpgConfEngineFeature, 0)) { mCryptoConfig = new QGpgMENewCryptoConfig; - } else -#endif - if (!QGpgMECryptoConfig::gpgConfPath().isEmpty()) { - mCryptoConfig = new QGpgMECryptoConfig(); - } + } } return mCryptoConfig; } |