From 6c72a4a95b4fcbd79fb6ec8d447fc2c295ff6869 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Mon, 20 Jul 2015 15:00:32 +0200
Subject: [PATCH] Fix building with QT_NO_BEARERMANAGEMENT

Some of the examples make no sense without bearer management and
QNetworkSession is not defined if QT_NO_BEARERMANAGEMENT, so
tst_qnetworkreply.cpp has to be adjusted.

Change-Id: Ic2f73746cba74f670ae5b5e99b0be1461ff6d182
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 examples/network/network.pro                     | 16 +++++++++++-----
 .../access/qnetworkreply/tst_qnetworkreply.cpp   |  3 ++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/examples/network/network.pro b/examples/network/network.pro
index 8ed72315e2..92003950a7 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -11,19 +11,25 @@ qtHaveModule(widgets) {
                 blockingfortuneclient \
                 broadcastreceiver \
                 broadcastsender \
-                fortuneclient \
-                fortuneserver \
                 http \
                 loopback \
                 threadedfortuneserver \
                 googlesuggest \
                 torrent \
-                bearermonitor \
                 multicastreceiver \
                 multicastsender
 
-    # no QProcess
-    !vxworks:!qnx:!winrt:SUBDIRS += network-chat
+    load(qfeatures)
+    !contains(QT_DISABLED_FEATURES, bearermanagement) {
+        # no QProcess
+        !vxworks:!qnx:!winrt:SUBDIRS += network-chat
+
+        SUBDIRS += \
+                bearermonitor \
+                fortuneclient \
+                fortuneserver
+
+    }
 
     contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
     contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 7d6cb94980..e68a52c032 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -7738,6 +7738,7 @@ void tst_QNetworkReply::emitErrorForAllReplies() // QTBUG-36890
 #ifdef QT_BUILD_INTERNAL
 void tst_QNetworkReply::backgroundRequest_data()
 {
+#ifndef QT_NO_BEARERMANAGEMENT
     QTest::addColumn<QUrl>("url");
     QTest::addColumn<bool>("background");
     QTest::addColumn<int>("policy");
@@ -7763,7 +7764,7 @@ void tst_QNetworkReply::backgroundRequest_data()
     QTest::newRow("ftp, bg, normal") << ftpurl << true << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
     QTest::newRow("ftp, fg, nobg") << ftpurl << false << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::NoError;
     QTest::newRow("ftp, bg, nobg") << ftpurl << true << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::BackgroundRequestNotAllowedError;
-
+#endif // !QT_NO_BEARERMANAGEMENT
 }
 #endif