diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-20 15:00:32 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-10-28 21:25:36 +0000 |
| commit | 6c72a4a95b4fcbd79fb6ec8d447fc2c295ff6869 (patch) | |
| tree | 045f7a02ef4027730a4c228eaa2080b0698dd054 /examples | |
| parent | 81c2ca7f223aadc35957760069ced140d1d78083 (diff) | |
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>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/network/network.pro | 16 |
1 files changed, 11 insertions, 5 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 |