diff options
author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-13 20:05:49 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-16 11:29:04 +0100 |
commit | 5b1aa4c75de4301d1417fd98bb1abf0767779736 (patch) | |
tree | 44d3bab26ec70c633abb20b58bb18f9d5bf54edb /tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp | |
parent | 23a372ab8d59cd9b33356a16744313890b544f4f (diff) |
Fixed build break when bearer is disabled.
Change-Id: I29e88b046f6502c84acc9c6f566ecc328cf24e38
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp')
-rw-r--r-- | tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp index ceedd17064..26bdec5c9b 100644 --- a/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp +++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp @@ -45,27 +45,31 @@ #include <QTimer> #include "../../qbearertestcommon.h" +#ifndef QT_NO_BEARERMANAGEMENT #include <QtNetwork/qnetworkconfigmanager.h> #include <QtNetwork/qnetworksession.h> +#endif QT_USE_NAMESPACE // Can be used to configure tests that require manual attention (such as roaming) //#define QNETWORKSESSION_MANUAL_TESTS 1 +#ifndef QT_NO_BEARERMANAGEMENT Q_DECLARE_METATYPE(QNetworkConfiguration) Q_DECLARE_METATYPE(QNetworkConfiguration::Type) +#endif class tst_QNetworkSession : public QObject { Q_OBJECT +#ifndef QT_NO_BEARERMANAGEMENT public slots: void initTestCase(); void cleanupTestCase(); private slots: - void robustnessBombing(); void sessionClosing_data(); @@ -92,8 +96,10 @@ private slots: private: QNetworkConfigurationManager manager; int inProcessSessionManagementCount; +#endif }; +#ifndef QT_NO_BEARERMANAGEMENT // Helper functions bool openSession(QNetworkSession *session); bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration = true); @@ -1250,7 +1256,7 @@ void tst_QNetworkSession::sessionAutoClose() QCOMPARE(autoCloseSession.toInt(), -1); } +#endif QTEST_MAIN(tst_QNetworkSession) - #include "tst_qnetworksession.moc" |