From fd92bdddb29ce54ec2625cce29c60871cc382be1 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 6 Sep 2010 15:13:38 +1000 Subject: compilation with QT_NO_DEPRECATED Reviewed-by: Andreas Kling (cherry picked from commit 033b53a02fb02c5aec412e3d87ad9661110c6e6e) Conflicts: src/network/bearer/qnetworkconfiguration.h --- src/network/bearer/qnetworkconfiguration.h | 2 ++ 1 file changed, 2 insertions(+) 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; -- cgit v0.12