diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-02-14 12:07:18 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-04-01 21:35:12 +0100 |
| commit | 4888e3e8401dc2e949f7e575c0e1e0036d746af6 (patch) | |
| tree | a669832b289e0bb17eb511d4042d20136b2269e9 /src/network/kernel/qnetworkproxy.h | |
| parent | ab91ac09924f7e356e4d2b8cf40c89a3c12011bb (diff) | |
Remove bearermanagement usage inside QNAM and QNetworkProxy
Change-Id: I2c4fdf598b46daf1b69a65848ebe0fd78ef8be24
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/kernel/qnetworkproxy.h')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h index d267e744e3..c3523f8847 100644 --- a/src/network/kernel/qnetworkproxy.h +++ b/src/network/kernel/qnetworkproxy.h @@ -75,22 +75,6 @@ public: QueryType queryType = TcpSocket); explicit QNetworkProxyQuery(quint16 bindPort, const QString &protocolTag = QString(), QueryType queryType = TcpServer); -#if !defined(QT_NO_BEARERMANAGEMENT) && QT_DEPRECATED_SINCE(5, 10) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - Q_DECL_DEPRECATED_X("QNetworkConfiguration support in QNetworkProxy is deprecated") - QNetworkProxyQuery(const QNetworkConfiguration &networkConfiguration, - const QUrl &requestUrl, QueryType queryType = UrlRequest); - Q_DECL_DEPRECATED_X("QNetworkConfiguration support in QNetworkProxy is deprecated") - QNetworkProxyQuery(const QNetworkConfiguration &networkConfiguration, - const QString &hostname, int port, const QString &protocolTag = QString(), - QueryType queryType = TcpSocket); - Q_DECL_DEPRECATED_X("QNetworkConfiguration support in QNetworkProxy is deprecated") - QNetworkProxyQuery(const QNetworkConfiguration &networkConfiguration, - quint16 bindPort, const QString &protocolTag = QString(), - QueryType queryType = TcpServer); -QT_WARNING_POP -#endif QNetworkProxyQuery(const QNetworkProxyQuery &other); QNetworkProxyQuery &operator=(QNetworkProxyQuery &&other) noexcept { swap(other); return *this; } QNetworkProxyQuery &operator=(const QNetworkProxyQuery &other); @@ -120,16 +104,6 @@ QT_WARNING_POP QUrl url() const; void setUrl(const QUrl &url); -#if !defined(QT_NO_BEARERMANAGEMENT) && QT_DEPRECATED_SINCE(5, 10) -QT_WARNING_PUSH -QT_WARNING_DISABLE_DEPRECATED - Q_DECL_DEPRECATED_X("QNetworkConfiguration support in QNetworkProxy is deprecated") - QNetworkConfiguration networkConfiguration() const; - Q_DECL_DEPRECATED_X("QNetworkConfiguration support in QNetworkProxy is deprecated") - void setNetworkConfiguration(const QNetworkConfiguration &networkConfiguration); -QT_WARNING_POP -#endif - private: QSharedDataPointer<QNetworkProxyQueryPrivate> d; }; |