diff options
Diffstat (limited to 'src/network/kernel/qnetworkproxy.h')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h index d267e744e3..1f0409e8ab 100644 --- a/src/network/kernel/qnetworkproxy.h +++ b/src/network/kernel/qnetworkproxy.h @@ -51,7 +51,6 @@ QT_BEGIN_NAMESPACE class QUrl; -class QNetworkConfiguration; class QNetworkProxyQueryPrivate; class Q_NETWORK_EXPORT QNetworkProxyQuery @@ -75,22 +74,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 +103,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; }; |