Merge remote-tracking branch 'origin/5.5' into dev

Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
index 4fee41ca8b..2fd80b3e71 100644
--- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
+++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
@@ -67,9 +67,7 @@ private slots:
     void sessionClosing_data();
     void sessionClosing();
 
-#ifndef QT_NO_PROCESS
     void outOfProcessSession();
-#endif
     void invalidSession();
 
     void repeatedOpenClose_data();
@@ -899,9 +897,11 @@ QDebug operator<<(QDebug debug, const QList<QNetworkConfiguration> &list)
 
 // Note: outOfProcessSession requires that at least one configuration is
 // at Discovered -state.
-#ifndef QT_NO_PROCESS
 void tst_QNetworkSession::outOfProcessSession()
 {
+#ifdef QT_NO_PROCESS
+    QSKIP("No qprocess support", SkipAll);
+#else
     updateConfigurations();
     QTest::qWait(2000);
 
@@ -996,8 +996,8 @@ void tst_QNetworkSession::outOfProcessSession()
     default:
         QSKIP("Lackey failed");
     }
-}
 #endif
+}
 
 // A convenience / helper function for testcases. Return the first matching configuration.
 // Ignores configurations in other than 'discovered' -state. Returns invalid (QNetworkConfiguration())