From 52afd781ad1ea61c6f0daf6633f5c65c006198fb Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Wed, 17 Apr 2013 15:58:38 +0300 Subject: Fix qprocess benchmark test build for WEC7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use Q_OS_WINCE ifdef in both method declaration and definition, in addition combine QT_NO_PROCESS and Q_OS_WINCE ifdefs to one line. Change-Id: I0787e4341c41b46a5fc089f24a538c0ad40a0875 Reviewed-by: Björn Breitmeyer Reviewed-by: Friedemann Kleint Reviewed-by: Andreas Holzammer --- tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp b/tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp index 0b569cc49d..8d388751d5 100644 --- a/tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp +++ b/tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp @@ -46,7 +46,7 @@ class tst_QProcess : public QObject { Q_OBJECT -#ifndef QT_NO_PROCESS +#if !defined(QT_NO_PROCESS) && !defined(Q_OS_WINCE) private slots: void echoTest_performance(); @@ -54,8 +54,7 @@ private slots: #endif // QT_NO_PROCESS }; -#ifndef QT_NO_PROCESS -#ifndef Q_OS_WINCE +#if !defined(QT_NO_PROCESS) && !defined(Q_OS_WINCE) // Reading and writing to a process is not supported on Qt/CE void tst_QProcess::echoTest_performance() { @@ -101,9 +100,8 @@ void tst_QProcess::echoTest_performance() process.closeWriteChannel(); QVERIFY(process.waitForFinished()); } -#endif // Q_OS_WINCE -#endif // QT_NO_PROCESS +#endif // QT_NO_PROCESS && Q_OS_WINCE QTEST_MAIN(tst_QProcess) #include "tst_bench_qprocess.moc" -- cgit v1.2.3