diff options
Diffstat (limited to 'src/network/bearer/qnetworksession.h')
| -rw-r--r-- | src/network/bearer/qnetworksession.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index 1b5ae9098b..37fe7948ad 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -40,6 +40,10 @@ #ifndef QNETWORKSESSION_H #define QNETWORKSESSION_H +#if 0 +#pragma qt_class(QNetworkSession) +#endif + #include <QtNetwork/qtnetworkglobal.h> #include <QtCore/qobject.h> #include <QtCore/qstring.h> @@ -47,6 +51,9 @@ #include <QtCore/qvariant.h> #include <QtNetwork/qnetworkconfiguration.h> +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + #ifndef QT_NO_BEARERMANAGEMENT #if defined(Q_OS_WIN) && defined(interface) @@ -57,7 +64,15 @@ QT_BEGIN_NAMESPACE class QNetworkSessionPrivate; -class Q_NETWORK_EXPORT QNetworkSession : 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 QNetworkSession : public QObject +#undef QT_DEPRECATED_VERSION_5_15_BUT_NOT_FOR_ICC { Q_OBJECT @@ -147,4 +162,6 @@ Q_DECLARE_METATYPE(QNetworkSession::UsagePolicies) #endif // QT_NO_BEARERMANAGEMENT +QT_WARNING_POP + #endif // QNETWORKSESSION_H |