From 0d9f43d534983411e37a9f3912de272a4a6ced64 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 13 Sep 2019 16:18:51 +0200 Subject: Doc: Edit QNetworkProxy::QNetworkProxy() default proxy type Fixes: QTBUG-61771 Change-Id: Ideafe6f8f81c156e941f0548c152021b01b606a1 Reviewed-by: Paul Wicking --- src/network/kernel/qnetworkproxy.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/network') diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 3646a9526a..febddfd880 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -494,8 +494,10 @@ template<> void QSharedDataPointer::detach() } /*! - Constructs a QNetworkProxy with DefaultProxy type; the proxy type is - determined by applicationProxy(), which defaults to NoProxy. + Constructs a QNetworkProxy with DefaultProxy type. + + The proxy type is determined by applicationProxy(), which defaults to + NoProxy or a system-wide proxy if one is configured. \sa setType(), setApplicationProxy() */ -- cgit v1.2.3