2 files changed, 12 insertions, 2 deletions
diff --git a/tests/auto/network/bearer/qnetworksession/lackey/main.cpp b/tests/auto/network/bearer/qnetworksession/lackey/main.cpp
index 2631e06f64..1182454fda 100644
--- a/tests/auto/network/bearer/qnetworksession/lackey/main.cpp
+++ b/tests/auto/network/bearer/qnetworksession/lackey/main.cpp
@@ -43,9 +43,11 @@
 #include <QStringList>
 #include <QLocalSocket>
 
+#ifndef QT_NO_BEARERMANAGEMENT
 #include <QtNetwork/qnetworkconfiguration.h>
 #include <QtNetwork/qnetworkconfigmanager.h>
 #include <QtNetwork/qnetworksession.h>
+#endif
 
 #include <QEventLoop>
 #include <QTimer>
@@ -62,6 +64,7 @@ int main(int argc, char** argv)
 {
     QCoreApplication app(argc, argv);
 
+#ifndef QT_NO_BEARERMANAGEMENT
     // Update configurations so that everything is up to date for this process too.
     // Event loop is used to wait for awhile.
     QNetworkConfigurationManager manager;
@@ -150,6 +153,7 @@ int main(int argc, char** argv)
 
     oopSocket.disconnectFromServer();
     oopSocket.waitForDisconnected(-1);
+#endif
 
     return 0;
 }
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"