Skip to content

Commit 62ac7bf

Browse files
committed
chore(qt)[sc-97670]: remove deprecated Qt networkAccessible code
1 parent 58f641f commit 62ac7bf

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/webdriver/extension_qt/qwebkit_proxy.cc

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ void JSLogger::error(QVariant message) {
167167

168168
QWebkitProxy::QWebkitProxy(Session* session, QWebPage* webpage) :
169169
session_(session),
170-
page_(webpage) {}
170+
page_(webpage),
171+
online_(false) {}
171172

172173
QWebkitProxy::~QWebkitProxy() {}
173174

@@ -1230,12 +1231,16 @@ Error* QWebkitProxy::GetMute(const ElementId& element, bool* mute) {
12301231

12311232
Error* QWebkitProxy::SetOnline(bool online) {
12321233
#ifndef QT_NO_BEARERMANAGEMENT
1234+
online_ = online;
1235+
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
12331236
QNetworkAccessManager *manager = page_->networkAccessManager();
1234-
if (online){
1237+
1238+
if (online_){
12351239
manager->setNetworkAccessible(QNetworkAccessManager::Accessible);
12361240
} else {
12371241
manager->setNetworkAccessible(QNetworkAccessManager::NotAccessible);
12381242
}
1243+
#endif
12391244
return NULL;
12401245
#else
12411246
session_->logger().Log(kWarningLogLevel, "In QWebkitProxy::SetOnline() defined QT_NO_BEARERMANAGEMENT");
@@ -1245,12 +1250,16 @@ Error* QWebkitProxy::SetOnline(bool online) {
12451250

12461251
Error* QWebkitProxy::IsOnline(bool* online) {
12471252
#ifndef QT_NO_BEARERMANAGEMENT
1253+
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
1254+
*online = online_;
1255+
#else
12481256
QNetworkAccessManager *manager = page_->networkAccessManager();
12491257
if (manager->networkAccessible() == QNetworkAccessManager::NotAccessible) {
12501258
*online = false;
12511259
} else {
12521260
*online = true;
12531261
}
1262+
#endif
12541263
return NULL;
12551264
#else
12561265
session_->logger().Log(kWarningLogLevel, "In QWebkitProxy::IsOnline() defined QT_NO_BEARERMANAGEMENT");

src/webdriver/extension_qt/qwebkit_proxy.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ class QWebkitProxy {
204204
protected:
205205
Session* session_;
206206
QWebPage* page_;
207+
bool online_;
207208

208209
QWebFrame* FindFrameByMeta(QWebFrame* parent, const FramePath &frame_path);
209210
QWebFrame* FindFrameByPath(QWebFrame* parent, const FramePath &frame_path);

0 commit comments

Comments
 (0)