1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix qprocess benchmark test build for WEC7.

Browse Source 
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 <bjoern.breitmeyer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
This commit is contained in:
Janne Anttila 2013-04-17 15:58:38 +03:00 committed by The Qt Project
parent 4f0770eaab
commit 52afd781ad
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/benchmarks/corelib/io/qprocess/tst_bench_qprocess.cpp
View File

@ -46,7 +46,7 @@ class tst_QProcess : public QObject
{ {
Q_OBJECT Q_OBJECT
#ifndef QT_NO_PROCESS #if !defined(QT_NO_PROCESS) && !defined(Q_OS_WINCE)
private slots: private slots:
void echoTest_performance(); void echoTest_performance();
@ -54,8 +54,7 @@ private slots:
#endif // QT_NO_PROCESS #endif // QT_NO_PROCESS
}; };
#ifndef QT_NO_PROCESS #if !defined(QT_NO_PROCESS) && !defined(Q_OS_WINCE)
#ifndef Q_OS_WINCE
// Reading and writing to a process is not supported on Qt/CE // Reading and writing to a process is not supported on Qt/CE
void tst_QProcess::echoTest_performance() void tst_QProcess::echoTest_performance()
{ {
@ -101,9 +100,8 @@ void tst_QProcess::echoTest_performance()
process.closeWriteChannel(); process.closeWriteChannel();
QVERIFY(process.waitForFinished()); QVERIFY(process.waitForFinished());
} }
#endif // Q_OS_WINCE
#endif // QT_NO_PROCESS #endif // QT_NO_PROCESS && Q_OS_WINCE
QTEST_MAIN(tst_QProcess) QTEST_MAIN(tst_QProcess)
#include "tst_bench_qprocess.moc" #include "tst_bench_qprocess.moc"