1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building with QT_NO_BEARERMANAGEMENT

Browse Source 
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>
This commit is contained in:
Ulf Hermann 2015-07-20 15:00:32 +02:00
parent 81c2ca7f22
commit 6c72a4a95b
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
examples/network/network.pro
View File

@ -11,20 +11,26 @@ qtHaveModule(widgets) {
blockingfortuneclient \ blockingfortuneclient \
broadcastreceiver \ broadcastreceiver \
broadcastsender \ broadcastsender \
fortuneclient \
fortuneserver \
http \ http \
loopback \ loopback \
threadedfortuneserver \ threadedfortuneserver \
googlesuggest \ googlesuggest \
torrent \ torrent \
bearermonitor \
multicastreceiver \ multicastreceiver \
multicastsender multicastsender
load(qfeatures)
!contains(QT_DISABLED_FEATURES, bearermanagement) {
# no QProcess # no QProcess
!vxworks:!qnx:!winrt:SUBDIRS += network-chat !vxworks:!qnx:!winrt:SUBDIRS += network-chat
SUBDIRS += \
bearermonitor \
fortuneclient \
fortuneserver
}
contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient
} }

3
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -7738,6 +7738,7 @@ void tst_QNetworkReply::emitErrorForAllReplies() // QTBUG-36890
#ifdef QT_BUILD_INTERNAL #ifdef QT_BUILD_INTERNAL
void tst_QNetworkReply::backgroundRequest_data() void tst_QNetworkReply::backgroundRequest_data()
{ {
#ifndef QT_NO_BEARERMANAGEMENT
QTest::addColumn<QUrl>("url"); QTest::addColumn<QUrl>("url");
QTest::addColumn<bool>("background"); QTest::addColumn<bool>("background");
QTest::addColumn<int>("policy"); 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, bg, normal") << ftpurl << true << (int)QNetworkSession::NoPolicy << QNetworkReply::NoError;
QTest::newRow("ftp, fg, nobg") << ftpurl << false << (int)QNetworkSession::NoBackgroundTrafficPolicy << 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; QTest::newRow("ftp, bg, nobg") << ftpurl << true << (int)QNetworkSession::NoBackgroundTrafficPolicy << QNetworkReply::BackgroundRequestNotAllowedError;
#endif // !QT_NO_BEARERMANAGEMENT
} }
#endif #endif