Add QNetworkProxy::usesSystemConfiguration() accessor

Allow to check programmatically whether using the system proxy settings
is enabled. To implement this the QSystemConfigurationProxyFactory is
replaced by an explicit boolean in QGlobalNetworkProxy.

Change-Id: I52231b4ffc890b085bcd1739acf93c97bdb18eb5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>

1 files changed, 0 insertions, 84 deletions

diff --git a/src/network/kernel/qnetworkproxy_p.h b/src/network/kernel/qnetworkproxy_p.h
deleted file mode 100644
index 733d8436d0..0000000000
--- a/src/network/kernel/qnetworkproxy_p.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 David Faure <dfaure@kdab.net>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtNetwork module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QNETWORKPROXY_P_H
-#define QNETWORKPROXY_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtNetwork/private/qtnetworkglobal_p.h>
-
-#ifndef QT_NO_NETWORKPROXY
-
-QT_BEGIN_NAMESPACE
-
-class QSystemConfigurationProxyFactory : public QNetworkProxyFactory
-{
-public:
-    QSystemConfigurationProxyFactory() : QNetworkProxyFactory() {}
-
-    virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery& query)
-    {
-        QList<QNetworkProxy> proxies = QNetworkProxyFactory::systemProxyForQuery(query);
-
-        // Make sure NoProxy is in the list, so that QTcpServer can work:
-        // it searches for the first proxy that can has the ListeningCapability capability
-        // if none have (as is the case with HTTP proxies), it fails to bind.
-        // NoProxy allows it to fallback to the 'no proxy' case and bind.
-        proxies.append(QNetworkProxy::NoProxy);
-
-        return proxies;
-    }
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_NETWORKINTERFACE
-
-#endif
-