diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 01:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 01:00:46 +0200 |
| commit | eb5f02c5cc493d88bd9ff20cbf2b6ed531229263 (patch) | |
| tree | 0ddc2d2f4077db3c42a4d8cbee5c7c3554880162 /src/network | |
| parent | 580572f3c9cb77283e63a58386002407957d7309 (diff) | |
| parent | f155c40fdc0b7bbc12804ba77c00e217ba6c2bb3 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib615dbfd783c5a3cf0f130ff82965382ce5cfb5a
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 110550c423..a2a89ed94b 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. @@ -493,8 +493,10 @@ template<> void QSharedDataPointer<QNetworkProxyPrivate>::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() */ |