Fix qprocess benchmark test build for WEC7.
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:
parent
4f0770eaab
commit
52afd781ad
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user