diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-11 01:00:56 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-03-11 15:34:21 +0100 |
| commit | 865afac25036d58b18794384e37d42931b2164c5 (patch) | |
| tree | e18d31138f1a8b9200764fd3648e58b9dd6b124f /src/network/access | |
| parent | 01bacdf7abb071198d843acdfb22ce1701766be8 (diff) | |
| parent | 52de905d0ec6159d3a1e7ad63fed018b5c6973d2 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ibee5acec72a1a1769d4bc5f23f56c7dc8d4cf3cb
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 2 | ||||
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.h | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 21d46011d7..d4df58e885 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -253,6 +253,7 @@ static void ensureInitialized() /*! \enum QNetworkAccessManager::NetworkAccessibility + \obsolete Indicates whether the network is accessible via this network access manager. @@ -268,6 +269,7 @@ static void ensureInitialized() /*! \property QNetworkAccessManager::networkAccessible \brief whether the network is currently accessible via this network access manager. + \obsolete \since 4.7 diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index 5194afb1be..f50dfbcca4 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -91,12 +91,15 @@ public: }; #ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section - enum NetworkAccessibility { + enum QT_DEPRECATED_VERSION_5_15 NetworkAccessibility { UnknownAccessibility = -1, NotAccessible = 0, Accessible = 1 }; +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED Q_ENUM(NetworkAccessibility) +QT_WARNING_POP #endif explicit QNetworkAccessManager(QObject *parent = nullptr); @@ -150,8 +153,11 @@ public: QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration configuration() const; QT_DEPRECATED_VERSION_5_15 QNetworkConfiguration activeConfiguration() const; +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QT_DEPRECATED_VERSION_5_15 void setNetworkAccessible(NetworkAccessibility accessible); QT_DEPRECATED_VERSION_5_15 NetworkAccessibility networkAccessible() const; +QT_WARNING_POP #endif #ifndef QT_NO_SSL @@ -187,7 +193,14 @@ Q_SIGNALS: #ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section QT_DEPRECATED_VERSION_5_15 void networkSessionConnected(); +#ifndef Q_MOC_RUN // moc has trouble with the expansion of these macros +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +#endif QT_DEPRECATED_VERSION_5_15 void networkAccessibleChanged(QNetworkAccessManager::NetworkAccessibility accessible); +#ifndef Q_MOC_RUN // moc has trouble with the expansion of these macros +QT_WARNING_POP +#endif #endif protected: |