summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-03-12 10:24:12 +0100
committerTor Arne Vestbø <torarnv@gmail.com>2020-03-12 10:48:22 +0100
commit6e32de256dba95c90bcfe48f32a82171c0f077a1 (patch)
tree4d12967848347238ecf458254f9ef59ccfa3e26f /src
parent179c23efb11d2bf24c694e9a5373c5bf7193c511 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/network/bearer/qnetworkconfigmanager.cpp2
-rw-r--r--src/network/bearer/qnetworkconfigmanager.h10
-rw-r--r--src/network/bearer/qnetworkconfiguration.cpp2
-rw-r--r--src/network/bearer/qnetworkconfiguration.h10
-rw-r--r--src/network/bearer/qnetworksession.cpp2
-rw-r--r--src/network/bearer/qnetworksession.h10
-rw-r--r--src/network/kernel/qtnetworkglobal.h9
-rw-r--r--src/network/kernel/qtnetworkglobal_p.h6
8 files changed, 24 insertions, 27 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 990f033db4e..eb3eb59c836 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 1bd2a4a0344..b8f09f3d683 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 841615db6a8..f016dea5904 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 0469508d9d1..69864a3165e 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 1d055689abc..4e8ed1619b8 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 37fe7948ad9..65d90b0a82a 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
diff --git a/src/network/kernel/qtnetworkglobal.h b/src/network/kernel/qtnetworkglobal.h
index 586b8478165..1a931cefa43 100644
--- a/src/network/kernel/qtnetworkglobal.h
+++ b/src/network/kernel/qtnetworkglobal.h
@@ -55,6 +55,15 @@ QT_BEGIN_NAMESPACE
# define Q_NETWORK_EXPORT
#endif
+// ### Qt6: Remove
+// 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_BEARER_MANAGEMENT
+#else
+#define QT_DEPRECATED_BEARER_MANAGEMENT QT_DEPRECATED_VERSION_5_15
+#endif
+
QT_END_NAMESPACE
#endif
diff --git a/src/network/kernel/qtnetworkglobal_p.h b/src/network/kernel/qtnetworkglobal_p.h
index 859e3d9ebd8..1d5a417f945 100644
--- a/src/network/kernel/qtnetworkglobal_p.h
+++ b/src/network/kernel/qtnetworkglobal_p.h
@@ -55,4 +55,10 @@
#include <QtCore/private/qglobal_p.h>
#include <QtNetwork/private/qtnetwork-config_p.h>
+// ### Qt6: Remove
+#ifdef QT_DEPRECATED_BEARER_MANAGEMENT
+#undef QT_DEPRECATED_BEARER_MANAGEMENT
+#endif
+#define QT_DEPRECATED_BEARER_MANAGEMENT
+
#endif // QTNETWORKGLOBAL_P_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-17 19:09:39 +0000