diff options
Diffstat (limited to 'tests/auto/corelib/io')
-rw-r--r-- | tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp | 5 | ||||
-rw-r--r-- | tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp index 9d3519680c..45f143b9fb 100644 --- a/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp +++ b/tests/auto/corelib/io/qprocessenvironment/tst_qprocessenvironment.cpp @@ -43,6 +43,10 @@ #include <QObject> #include <QProcessEnvironment> +#ifdef QT_NO_PROCESS +QTEST_NOOP_MAIN +#else + class tst_QProcessEnvironment: public QObject { Q_OBJECT @@ -318,3 +322,4 @@ void tst_QProcessEnvironment::putenv() QTEST_MAIN(tst_QProcessEnvironment) #include "tst_qprocessenvironment.moc" +#endif diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp index a6e1f73904..56c07f1590 100644 --- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp @@ -194,7 +194,7 @@ private slots: void pos(); void pos2(); void pos3LargeFile(); -#ifndef Q_OS_WINCE +#if !defined(Q_OS_WINCE) && !defined(QT_NO_PROCESS) void readStdin(); void readAllFromStdin(); void readLineFromStdin(); @@ -1386,8 +1386,8 @@ void tst_QTextStream::pos3LargeFile() } // ------------------------------------------------------------------------------ -#ifndef Q_OS_WINCE // Qt/CE has no stdin/out support for processes +#if !defined(Q_OS_WINCE) && !defined(QT_NO_PROCESS) void tst_QTextStream::readStdin() { QProcess stdinProcess; @@ -1409,10 +1409,8 @@ void tst_QTextStream::readStdin() QCOMPARE(b, 2); QCOMPARE(c, 3); } -#endif // ------------------------------------------------------------------------------ -#ifndef Q_OS_WINCE // Qt/CE has no stdin/out support for processes void tst_QTextStream::readAllFromStdin() { @@ -1430,10 +1428,8 @@ void tst_QTextStream::readAllFromStdin() QChar quoteChar('"'); QCOMPARE(stream.readAll(), QString::fromLatin1("%1hello world%2 \n").arg(quoteChar).arg(quoteChar)); } -#endif // ------------------------------------------------------------------------------ -#ifndef Q_OS_WINCE // Qt/CE has no stdin/out support for processes void tst_QTextStream::readLineFromStdin() { |