Bearer deprecation: centralize and suppress internal warnings

We can't get rid of internal use, so let's work around that by not
marking it deprecated in private code.

Change-Id: If6cbfff4f16c30892335633567326141fbc44092
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

6 files changed, 9 insertions, 27 deletions

diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 990f033db4..eb3eb59c83 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -37,6 +37,8 @@
 **
 ****************************************************************************/
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #include "qnetworkconfigmanager.h"
 
 #include "qnetworkconfigmanager_p.h"
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h
index 1bd2a4a034..b8f09f3d68 100644
--- a/src/network/bearer/qnetworkconfigmanager.h
+++ b/src/network/bearer/qnetworkconfigmanager.h
@@ -56,15 +56,7 @@ QT_WARNING_DISABLE_DEPRECATED
 QT_BEGIN_NAMESPACE
 
 class QNetworkConfigurationManagerPrivate;
-// We work around an issue in ICC where it errors out during compilation of Qt by not marking it
-// deprecated if ICC is used
-#ifdef Q_CC_INTEL
-#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
-#else
-#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC QT_DEPRECATED_VERSION_5_15
-#endif
-class QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject
-#undef QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
+class QT_DEPRECATED_BEARER_MANAGEMENT Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject
 {
     Q_OBJECT
 
diff --git a/src/network/bearer/qnetworkconfiguration.cpp b/src/network/bearer/qnetworkconfiguration.cpp
index 841615db6a..f016dea590 100644
--- a/src/network/bearer/qnetworkconfiguration.cpp
+++ b/src/network/bearer/qnetworkconfiguration.cpp
@@ -37,6 +37,8 @@
 **
 ****************************************************************************/
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #include "qnetworkconfiguration.h"
 #include "qnetworkconfiguration_p.h"
 #include <QDebug>
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index 0469508d9d..69864a3165 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -57,15 +57,7 @@ QT_WARNING_DISABLE_DEPRECATED
 QT_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
-// We work around an issue in ICC where it errors out during compilation of Qt by not marking it
-// deprecated if ICC is used
-#ifdef Q_CC_INTEL
-#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
-#else
-#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC QT_DEPRECATED_VERSION_5_15
-#endif
-class QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC Q_NETWORK_EXPORT QNetworkConfiguration
-#undef QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
+class QT_DEPRECATED_BEARER_MANAGEMENT Q_NETWORK_EXPORT QNetworkConfiguration
 {
 public:
     QNetworkConfiguration();
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 1d055689ab..4e8ed1619b 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -37,6 +37,8 @@
 **
 ****************************************************************************/
 
+#include <QtNetwork/private/qtnetworkglobal_p.h>
+
 #include "qnetworksession.h"
 #include "qnetworksession_p.h"
 #include "qbearerengine_p.h"
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index 37fe7948ad..65d90b0a82 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -64,15 +64,7 @@ QT_WARNING_DISABLE_DEPRECATED
 QT_BEGIN_NAMESPACE
 
 class QNetworkSessionPrivate;
-// We work around an issue in ICC where it errors out during compilation of Qt by not marking it
-// deprecated if ICC is used
-#ifdef Q_CC_INTEL
-#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
-#else
-#define QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC QT_DEPRECATED_VERSION_5_15
-#endif
-class QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC Q_NETWORK_EXPORT QNetworkSession : public QObject
-#undef QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC
+class QT_DEPRECATED_BEARER_MANAGEMENT Q_NETWORK_EXPORT QNetworkSession : public QObject
 {
     Q_OBJECT