diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:37:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:38:02 +0100 |
| commit | 135ebe4f3d268121047fdbfee49f2dd52006165e (patch) | |
| tree | 6b303103f36e69e29cfa860b8b7afc584c55d6f3 /tests/auto/network/access/qnetworkreply | |
| parent | e7feb956280105113b3e58f12e5f32f54199a95a (diff) | |
| parent | 1e8f50a8d069c97ea6a4f00d664c12e594884f54 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e
Diffstat (limited to 'tests/auto/network/access/qnetworkreply')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index cd14e42f8f..dcb3df834d 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -302,10 +302,8 @@ private Q_SLOTS: void ioPutToFileFromSocket(); void ioPutToFileFromLocalSocket_data(); void ioPutToFileFromLocalSocket(); -#ifndef QT_NO_PROCESS void ioPutToFileFromProcess_data(); void ioPutToFileFromProcess(); -#endif void ioPutToFtpFromFile_data(); void ioPutToFtpFromFile(); void ioPutToHttpFromFile_data(); @@ -4295,14 +4293,19 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket() } // Currently no stdin/out supported for Windows CE. -#ifndef QT_NO_PROCESS void tst_QNetworkReply::ioPutToFileFromProcess_data() { +#ifndef QT_NO_PROCESS putToFile_data(); +#endif } void tst_QNetworkReply::ioPutToFileFromProcess() { +#ifdef QT_NO_PROCESS + QSKIP("No qprocess support", SkipAll); +#else + #if defined(Q_OS_WINCE) QSKIP("Currently no stdin/out supported for Windows CE"); #else @@ -4340,8 +4343,9 @@ void tst_QNetworkReply::ioPutToFileFromProcess() QByteArray contents = file.readAll(); QCOMPARE(contents, data); #endif + +#endif // QT_NO_PROCESS } -#endif void tst_QNetworkReply::ioPutToFtpFromFile_data() { |