summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmake/tst_qmake.cpp
diff options
context:
space:
mode:
authorJoão Abecasis <joao@abecasis.name>2009-03-19 12:36:56 (GMT)
committerJoão Abecasis <joao@abecasis.name>2009-04-02 14:29:49 (GMT)
commit605746fd14ff68f19a806bb54882fb967fccc8e8 (patch)
treef4679f7e4ae9cf7df7846fc416623fcbf699705e /tests/auto/qmake/tst_qmake.cpp
parent0d026b267badbf7890b02256826f0ff3821fcec7 (diff)
downloadQt-605746fd14ff68f19a806bb54882fb967fccc8e8.zip
Qt-605746fd14ff68f19a806bb54882fb967fccc8e8.tar.gz
Qt-605746fd14ff68f19a806bb54882fb967fccc8e8.tar.bz2
In qmake tests, allow child environment to be manipulated
... without having to change the parent process's environment. Reviewed-by: mariusSO
Diffstat (limited to 'tests/auto/qmake/tst_qmake.cpp')
-rw-r--r--tests/auto/qmake/tst_qmake.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp
index 07389e9..70f1f3c 100644
--- a/tests/auto/qmake/tst_qmake.cpp
+++ b/tests/auto/qmake/tst_qmake.cpp
@@ -247,10 +247,10 @@ void tst_qmake::duplicateLibraryEntries()
void tst_qmake::export_across_file_boundaries()
{
// This relies on features so we need to set the QMAKEFEATURES environment variable
- putenv("QMAKEFEATURES=.");
+ test_compiler.addToEnvironment("QMAKEFEATURES=.");
QString workDir = base_path + "/testdata/export_across_file_boundaries";
QVERIFY( test_compiler.qmake( workDir, "foo" ));
- putenv("QMAKEFEATURES=");
+ test_compiler.resetEnvironment();
}
void tst_qmake::include_dir()