summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-08-06 08:31:20 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-06 08:49:18 (GMT)
commit033b53a02fb02c5aec412e3d87ad9661110c6e6e (patch)
treea89881c6dedde74fb287e3cf839f76ccf71f7127 /src/network
parenteb6d70eeeaaafb748a5fca38f6f033136aadf148 (diff)
downloadQt-033b53a02fb02c5aec412e3d87ad9661110c6e6e.zip
Qt-033b53a02fb02c5aec412e3d87ad9661110c6e6e.tar.gz
Qt-033b53a02fb02c5aec412e3d87ad9661110c6e6e.tar.bz2
compilation with QT_NO_DEPRECATED
Reviewed-by: Andreas Kling
Diffstat (limited to 'src/network')
-rw-r--r--src/network/bearer/qnetworkconfiguration.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h
index d9d36fd..02f9cb6 100644
--- a/src/network/bearer/qnetworkconfiguration.h
+++ b/src/network/bearer/qnetworkconfiguration.h
@@ -120,7 +120,9 @@ public:
Purpose purpose() const;
// Required to maintain source compatibility with Qt Mobility.
+#ifdef QT_DEPRECATED
QT_DEPRECATED inline QString bearerName() const { return bearerTypeName(); }
+#endif
BearerType bearerType() const;
QString bearerTypeName() const;