QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-04-27 12:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix cross-compile under fedora mingw

Browse Source
This commit is contained in:
Albert Astals Cid 2020-03-10 17:41:56 +01:00
parent 02585a58e3
commit cfea73392b
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/qca-gnupg/utils.cpp
View File

@ -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

4
src/qca_core.cpp
View File

@ -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;