Skip to content

Commit 11b54b8

Browse files
author
Juha Vuolle
committed
Fix tst_qnetworkreply compilation when networkproxy is disabled
Add a feature guard for test function relying on networkproxy. Pick-to: 6.9 6.8 Task-number: QTBUG-136101 Change-Id: I69d97c84fb7d68f33f4b74fc8fd6665b1b8d6717 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
1 parent bdacb87 commit 11b54b8

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,9 +593,10 @@ private Q_SLOTS:
593593
#if QT_CONFIG(http)
594594
void qhttpPartDebug_data();
595595
void qhttpPartDebug();
596-
596+
#if QT_CONFIG(networkproxy)
597597
void qtbug68821proxyError_data();
598598
void qtbug68821proxyError();
599+
#endif
599600
#endif
600601

601602
void abortAndError();
@@ -10670,6 +10671,7 @@ void tst_QNetworkReply::qhttpPartDebug()
1067010671
QVERIFY2(msg.contains(value), "Missing header value: " + value);
1067110672
}
1067210673

10674+
#if QT_CONFIG(networkproxy)
1067310675
void tst_QNetworkReply::qtbug68821proxyError_data()
1067410676
{
1067510677
QTest::addColumn<QString>("proxyHost");
@@ -10718,7 +10720,8 @@ void tst_QNetworkReply::qtbug68821proxyError()
1071810720
QCOMPARE(spy.count(), 1);
1071910721
QCOMPARE(spy.at(0).at(0), error);
1072010722
}
10721-
#endif
10723+
#endif // QT_CONFIG(networkproxy)
10724+
#endif // QT_CONFIG(http)
1072210725

1072310726
void tst_QNetworkReply::abortAndError()
1072410727
{

0 commit comments

Comments
 (0)