diff options
Diffstat (limited to 'src/network/bearer/qnetworkconfigmanager.h')
| -rw-r--r-- | src/network/bearer/qnetworkconfigmanager.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h index e8866999c7..1bd2a4a034 100644 --- a/src/network/bearer/qnetworkconfigmanager.h +++ b/src/network/bearer/qnetworkconfigmanager.h @@ -40,16 +40,31 @@ #ifndef QNETWORKCONFIGMANAGER_H #define QNETWORKCONFIGMANAGER_H +#if 0 +#pragma qt_class(QNetworkConfigurationManager) +#endif + #include <QtNetwork/qtnetworkglobal.h> #include <QtCore/qobject.h> #include <QtNetwork/qnetworkconfiguration.h> +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + #ifndef QT_NO_BEARERMANAGEMENT QT_BEGIN_NAMESPACE class QNetworkConfigurationManagerPrivate; -class Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject +// 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 { Q_OBJECT @@ -97,4 +112,6 @@ QT_END_NAMESPACE #endif // QT_NO_BEARERMANAGEMENT +QT_WARNING_POP + #endif // QNETWORKCONFIGMANAGER_H |