From d43d787e9ac153f67505fee95a975b4e8f6f928e Mon Sep 17 00:00:00 2001 From: Ingo Klöcker Date: Fri, 22 Sep 2023 09:14:34 +0200 Subject: qt: Use UTF-8 for file names on Windows * lang/qt/src/qgpgmedecryptverifyarchivejob.cpp (decrypt_verify_from_file_name): On Windows, convert Unicode file name to UTF-8. * lang/qt/src/qgpgmeencryptarchivejob.cpp (encrypt, encrypt_to_filename): On Windows, convert Unicode file name from/to UTF-8. * lang/qt/src/qgpgmesignarchivejob.cpp (sign, sign_to_filename): Ditto. * lang/qt/src/qgpgmesignencryptarchivejob.cpp (sign_encrypt, sign_encrypt_to_filename): Ditto. -- On Windows, GnuPG expects file names to be UTF-8-encoded. This fixes encrypting and decrypting folders with umlauts in the folder name and in the file name of the archive. Encrypting and decrypting folders with kanji still fails. GnuPG-bug-id: 6728 --- lang/qt/src/qgpgmedecryptverifyarchivejob.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lang/qt/src/qgpgmedecryptverifyarchivejob.cpp') diff --git a/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp b/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp index 98ca7403..1d642b0f 100644 --- a/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp +++ b/lang/qt/src/qgpgmedecryptverifyarchivejob.cpp @@ -122,7 +122,11 @@ static QGpgMEDecryptVerifyArchiveJob::result_type decrypt_verify_from_file_name( const QString &outputDirectory) { Data indata; +#ifdef Q_OS_WIN + indata.setFileName(inputFile.toUtf8().constData()); +#else indata.setFileName(QFile::encodeName(inputFile).constData()); +#endif return decrypt_verify(ctx, indata, outputDirectory); } -- cgit