From c597cbb8a4748039fde14fbfb70cd148ff26224b Mon Sep 17 00:00:00 2001 From: ninerider Date: Thu, 24 Sep 2009 11:22:55 +0200 Subject: tst_qrocess compilation fix for Windows CE Mismatching preprocessor statements cleaned up. Reviewed-by: Joerg --- tests/auto/qprocess/tst_qprocess.cpp | 4 ++-- 1 file 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 + -- cgit v0.12