summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--framework/src/domain/mime/mimetreeparser/autotests/setupenv.cpp4
-rw-r--r--framework/src/domain/mime/mimetreeparser/tests/gpgerrortest.cpp6
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 @@
27 27
28void MimeTreeParser::Test::setupEnv() 28void MimeTreeParser::Test::setupEnv()
29{ 29{
30 setenv("LC_ALL", "C", 1); 30 qputenv("LC_ALL", "C");
31 setenv("KDEHOME", QFile::encodeName(QDir::homePath() + QString::fromLatin1("/.qttest")).constData(), 1); 31 qputenv("KDEHOME", QFile::encodeName(QDir::homePath() + QString::fromLatin1("/.qttest")).constData());
32 QStandardPaths::setTestModeEnabled(true); 32 QStandardPaths::setTestModeEnabled(true);
33} 33}
34 34
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:
174 void unsetEnv(const QByteArray &name) 174 void unsetEnv(const QByteArray &name)
175 { 175 {
176 mModifiedEnv << name; 176 mModifiedEnv << name;
177 unsetenv(name); 177 qunsetenv(name);
178 } 178 }
179 179
180 void setEnv(const QByteArray &name, const QByteArray &value) 180 void setEnv(const QByteArray &name, const QByteArray &value)
@@ -187,9 +187,9 @@ private:
187 { 187 {
188 foreach(const auto &i, mModifiedEnv) { 188 foreach(const auto &i, mModifiedEnv) {
189 if (mEnv.contains(i)) { 189 if (mEnv.contains(i)) {
190 setenv(i, mEnv.value(i).toUtf8(), 1); 190 qputenv(i, mEnv.value(i).toUtf8());
191 } else { 191 } else {
192 unsetenv(i); 192 qunsetenv(i);
193 } 193 }
194 } 194 }
195 } 195 }