diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-06 05:13:38 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-06 05:13:38 (GMT) |
| commit | fd92bdddb29ce54ec2625cce29c60871cc382be1 (patch) | |
| tree | f5d61a5e10940266a4189442252ceb3f4046aadf /src/network | |
| parent | c31adf5be96455abcd27dbf075053ffaedafa65d (diff) | |
| download | Qt-fd92bdddb29ce54ec2625cce29c60871cc382be1.zip Qt-fd92bdddb29ce54ec2625cce29c60871cc382be1.tar.gz Qt-fd92bdddb29ce54ec2625cce29c60871cc382be1.tar.bz2 | |
compilation with QT_NO_DEPRECATED
Reviewed-by: Andreas Kling
(cherry picked from commit 033b53a02fb02c5aec412e3d87ad9661110c6e6e)
Conflicts:
src/network/bearer/qnetworkconfiguration.h
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/bearer/qnetworkconfiguration.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index e4f762a..18b92a9 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 QString bearerName() const; +#endif BearerType bearerType() const; QString bearerTypeName() const; |