diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2013-01-16 14:34:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 10:38:59 +0100 |
| commit | 416e73a0fcaf31f7c32ba7dcd214b62e6060123c (patch) | |
| tree | 1be730c488c0f979a5ab1ffb40631489a5a9c94b /tests/auto/network | |
| parent | 2d2da44f6381fdeaa195319c0dc66e3909c2ca7b (diff) | |
Check existence of QProcess feature before using it on Qt autotests.
VxWorks does not have QProcess support.
Change-Id: I20ed479125097d468a1aa50afb18c3749f0fbb98
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'tests/auto/network')
| -rw-r--r-- | tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp index f2543eecc3..2f0e7dbe9a 100644 --- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp +++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp @@ -75,7 +75,9 @@ private slots: void sessionClosing_data(); void sessionClosing(); +#ifndef QT_NO_PROCESS void outOfProcessSession(); +#endif void invalidSession(); void repeatedOpenClose_data(); @@ -901,6 +903,7 @@ 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() { updateConfigurations(); @@ -998,6 +1001,7 @@ void tst_QNetworkSession::outOfProcessSession() 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()) |