From 5c8eebb3ecf96187995fc55570101c1000c56490 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 2 May 2018 22:30:08 +0200 Subject: windows compat --- framework/src/domain/mime/mimetreeparser/autotests/setupenv.cpp | 4 ++-- framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/src/domain/mime/mimetreeparser/autotests/setupenv.cpp b/framework/src/domain/mime/mimetreeparser/autotests/setupenv.cpp index be7a8685..47eaec11 100644 --- a/framework/src/domain/mime/mimetreeparser/autotests/setupenv.cpp +++ b/framework/src/domain/mime/mimetreeparser/autotests/setupenv.cpp @@ -27,8 +27,8 @@ void MimeTreeParser::Test::setupEnv() { - setenv("LC_ALL", "C", 1); - setenv("KDEHOME", QFile::encodeName(QDir::homePath() + QString::fromLatin1("/.qttest")).constData(), 1); + qputenv("LC_ALL", "C"); + qputenv("KDEHOME", QFile::encodeName(QDir::homePath() + QString::fromLatin1("/.qttest")).constData()); QStandardPaths::setTestModeEnabled(true); } diff --git a/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp b/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp index 356c0821..5d7c4683 100644 --- a/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp +++ b/framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp @@ -174,7 +174,7 @@ private: void unsetEnv(const QByteArray &name) { mModifiedEnv << name; - unsetenv(name); + qunsetenv(name); } void setEnv(const QByteArray &name, const QByteArray &value) @@ -187,9 +187,9 @@ private: { foreach(const auto &i, mModifiedEnv) { if (mEnv.contains(i)) { - setenv(i, mEnv.value(i).toUtf8(), 1); + qputenv(i, mEnv.value(i).toUtf8()); } else { - unsetenv(i); + qunsetenv(i); } } } -- cgit v1.2.3