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

Fix tst_qnetworkreply compilation when networkproxy is disabled

Browse Source 
Add a feature guard for test function relying on networkproxy.

Pick-to: 6.8
Task-number: QTBUG-136101
Change-Id: I69d97c84fb7d68f33f4b74fc8fd6665b1b8d6717
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 11b54b85ce74d59173afd297b780d3170b331548)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Juha Vuolle 2025-04-22 11:46:31 +03:00 committed by Qt Cherry-pick Bot
parent 518507bcfa
commit b2ad8f05ba
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -593,9 +593,10 @@ private Q_SLOTS:
#if QT_CONFIG(http) #if QT_CONFIG(http)
void qhttpPartDebug_data(); void qhttpPartDebug_data();
void qhttpPartDebug(); void qhttpPartDebug();
#if QT_CONFIG(networkproxy)
void qtbug68821proxyError_data(); void qtbug68821proxyError_data();
void qtbug68821proxyError(); void qtbug68821proxyError();
#endif
#endif #endif
void abortAndError(); void abortAndError();
@ -10670,6 +10671,7 @@ void tst_QNetworkReply::qhttpPartDebug()
QVERIFY2(msg.contains(value), "Missing header value: " + value); QVERIFY2(msg.contains(value), "Missing header value: " + value);
} }
#if QT_CONFIG(networkproxy)
void tst_QNetworkReply::qtbug68821proxyError_data() void tst_QNetworkReply::qtbug68821proxyError_data()
{ {
QTest::addColumn<QString>("proxyHost"); QTest::addColumn<QString>("proxyHost");
@ -10718,7 +10720,8 @@ void tst_QNetworkReply::qtbug68821proxyError()
QCOMPARE(spy.count(), 1); QCOMPARE(spy.count(), 1);
QCOMPARE(spy.at(0).at(0), error); QCOMPARE(spy.at(0).at(0), error);
} }
#endif #endif // QT_CONFIG(networkproxy)
#endif // QT_CONFIG(http)
void tst_QNetworkReply::abortAndError() void tst_QNetworkReply::abortAndError()
{ {