Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
  suppress pointer aliasing warnings
  Fix compilation with namespace.
  Assistant: Make ~AbstractHelpViewer() virtual.
  Prepare German translations for 4.7 (except Quick).
  tr()-Fixes in Assistant/QHelpLib code.
  Remove QObject::tr() in the network module code.

2 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/bearer/generic/qgenericengine.cpp b/src/plugins/bearer/generic/qgenericengine.cpp
index a95b14b..f654038 100644
--- a/src/plugins/bearer/generic/qgenericengine.cpp
+++ b/src/plugins/bearer/generic/qgenericengine.cpp
@@ -62,6 +62,7 @@
 #include <net/if_arp.h>
 #endif
 
+QT_BEGIN_NAMESPACE
 
 static QString qGetInterfaceType(const QString &interface)
 {
diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp
index a9e93e0..e7c56a2 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp
@@ -1080,14 +1080,14 @@ QString QNetworkSessionPrivateImpl::errorString() const
     QString errorStr;
     switch(q->error()) {
     case QNetworkSession::RoamingError:
-        errorStr = QObject::tr("Roaming error");
+        errorStr = QNetworkSessionPrivateImpl::tr("Roaming error");
         break;
     case QNetworkSession::SessionAbortedError:
-        errorStr = QObject::tr("Session aborted by user or system");
+        errorStr = QNetworkSessionPrivateImpl::tr("Session aborted by user or system");
         break;
     default:
     case QNetworkSession::UnknownSessionError:
-        errorStr = QObject::tr("Unidentified Error");
+        errorStr = QNetworkSessionPrivateImpl::tr("Unidentified Error");
         break;
     }
     return errorStr;