diff options
| author | Maximilian Krambach <[email protected]> | 2018-05-09 14:55:50 +0000 |
|---|---|---|
| committer | Maximilian Krambach <[email protected]> | 2018-05-09 14:55:50 +0000 |
| commit | 5f5bf024a83625b8f8bac4779b1c2236637c23e0 (patch) | |
| tree | 28820efe4193c6fba8dbe795d5a042b035355967 /lang/qt/src/qgpgmenewcryptoconfig.cpp | |
| parent | js: more testing (diff) | |
| parent | json: Improve auto-base64 encoding to not split UTF-8 chars. (diff) | |
| download | gpgme-5f5bf024a83625b8f8bac4779b1c2236637c23e0.tar.gz gpgme-5f5bf024a83625b8f8bac4779b1c2236637c23e0.zip | |
Merge branch 'master' into javascript-binding
Diffstat (limited to '')
| -rw-r--r-- | lang/qt/src/qgpgmenewcryptoconfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp index ba028a97..070ab697 100644 --- a/lang/qt/src/qgpgmenewcryptoconfig.cpp +++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp @@ -42,6 +42,7 @@ #include "gpgme_backend_debug.h" #include <QFile> +#include <QDir> #include "global.h" #include "error.h" @@ -521,8 +522,7 @@ QUrl QGpgMENewCryptoConfigEntry::urlValue() const Q_ASSERT(type == FilenameType || type == LdapServerType); Q_ASSERT(!isList()); if (type == FilenameType) { - QUrl url; - url.setPath(QFile::decodeName(m_option.currentValue().stringValue())); + QUrl url = QUrl::fromLocalFile(m_option.currentValue().stringValue()); return url; } return parseURL(type, stringValue()); @@ -635,7 +635,7 @@ void QGpgMENewCryptoConfigEntry::setURLValue(const QUrl &url) if (str.isEmpty() && !isOptional()) { m_option.resetToDefaultValue(); } else if (type == FilenameType) { - m_option.setNewValue(m_option.createStringArgument(QFile::encodeName(str).constData())); + m_option.setNewValue(m_option.createStringArgument(QDir::toNativeSeparators(url.toLocalFile()).toUtf8().constData())); } else { m_option.setNewValue(m_option.createStringArgument(str.toUtf8().constData())); } |