From cfea73392b22f24d3f97071176223c104e76d8bd Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Tue, 10 Mar 2020 17:41:56 +0100
Subject: [PATCH] Fix cross-compile under fedora mingw
---
plugins/qca-gnupg/utils.cpp | 11 +++++------
src/qca_core.cpp | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/plugins/qca-gnupg/utils.cpp b/plugins/qca-gnupg/utils.cpp
index 2c7f5e6c..9a42a23f 100644
--- a/plugins/qca-gnupg/utils.cpp
+++ b/plugins/qca-gnupg/utils.cpp
@@ -79,8 +79,7 @@ static bool get_reg_key(HKEY root, const char *path, QString &value)
static QString find_reg_gpgProgram()
{
- QStringList bins;
- bins << "gpg.exe" << "gpg2.exe";
+ const QStringList bins = { QStringLiteral("gpg.exe"), QStringLiteral("gpg2.exe") };
HKEY root;
root = HKEY_CURRENT_USER;
@@ -99,9 +98,9 @@ static QString find_reg_gpgProgram()
{
foreach (const QString &bin, bins)
{
- if (check_bin(dir + "\\" + bin))
+ if (check_bin(dir + QStringLiteral("\\") + bin))
{
- return dir + "\\" + bin;
+ return dir + QStringLiteral("\\") + bin;
}
}
}
@@ -115,7 +114,7 @@ QString find_bin()
// so any from them can be used
QStringList bins;
#ifdef Q_OS_WIN
- bins << "gpg.exe" << "gpg2.exe";
+ bins << QStringLiteral("gpg.exe") << QStringLiteral("gpg2.exe");
#else
bins << QStringLiteral("gpg") << QStringLiteral("gpg2");
#endif
@@ -138,7 +137,7 @@ QString find_bin()
// Look up at PATH environment
#ifdef Q_OS_WIN
- QString pathSep = ";";
+ const QString pathSep = QStringLiteral(";");
#else
const QString pathSep = QStringLiteral(":");
#endif
diff --git a/src/qca_core.cpp b/src/qca_core.cpp
index 75520a19..eacb8957 100644
--- a/src/qca_core.cpp
+++ b/src/qca_core.cpp
@@ -223,12 +223,12 @@ void init(MemoryMode mode, int prealloc)
bool secmem = botan_init(prealloc, allow_mmap_fallback);
+#if defined(Q_OS_UNIX)
if ((geteuid() == 0) && drop_root)
{
-#if defined(Q_OS_UNIX)
setuid(getuid());
-#endif
}
+#endif
global = new Global;
global->secmem = secmem;