summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorninerider <qt-info@nokia.com>2009-09-24 09:22:55 (GMT)
committerninerider <qt-info@nokia.com>2009-09-25 07:51:13 (GMT)
commitc597cbb8a4748039fde14fbfb70cd148ff26224b (patch)
tree011e3b48d4bf993d222411fe1feb9c120fc544d1 /tests
parent82275b4c03a0db8f0a95ff4444f06d9d913aa776 (diff)
downloadQt-c597cbb8a4748039fde14fbfb70cd148ff26224b.zip
Qt-c597cbb8a4748039fde14fbfb70cd148ff26224b.tar.gz
Qt-c597cbb8a4748039fde14fbfb70cd148ff26224b.tar.bz2
tst_qrocess compilation fix for Windows CE
Mismatching preprocessor statements cleaned up. Reviewed-by: Joerg
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qprocess/tst_qprocess.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index cff6487..e759b0e 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -1874,7 +1874,6 @@ void tst_QProcess::setEnvironment()
QCOMPARE(process.readAll(), value.toLocal8Bit());
}
-#endif
}
//-----------------------------------------------------------------------------
@@ -1887,7 +1886,6 @@ void tst_QProcess::setProcessEnvironment()
{
#if !defined (Q_OS_WINCE)
// there is no concept of system variables on Windows CE as there is no console
-
// make sure our environment variables are correct
QVERIFY(qgetenv("tst_QProcess").isEmpty());
QVERIFY(!qgetenv("PATH").isEmpty());
@@ -1917,6 +1915,7 @@ void tst_QProcess::setProcessEnvironment()
QCOMPARE(process.readAll(), value.toLocal8Bit());
}
+#endif
}
//-----------------------------------------------------------------------------
void tst_QProcess::systemEnvironment()
@@ -2388,3 +2387,4 @@ void tst_QProcess::invalidProgramString()
QTEST_MAIN(tst_QProcess)
#include "tst_qprocess.moc"
#endif
+