diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-02 05:44:23 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-02 05:44:23 (GMT) |
| commit | 2c6de1ce1489668253b7d3a5df3f2194fbd1bee7 (patch) | |
| tree | 3e4298cdb45f9b60ac9b7bb27b5ec3bdbd540b2f /src/plugins/bearer/icd | |
| parent | d042a00b5828961e1e1fa82017717b5f72dde9ef (diff) | |
| parent | 82991e40afd46f91de42dec048df705441b6b0cf (diff) | |
| download | Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.zip Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.tar.gz Qt-2c6de1ce1489668253b7d3a5df3f2194fbd1bee7.tar.bz2 | |
Merge remote branch 'staging/4.7' into HEAD
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
Diffstat (limited to 'src/plugins/bearer/icd')
| -rw-r--r-- | src/plugins/bearer/icd/qnetworksession_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp index 2acaa47..03624fa 100644 --- a/src/plugins/bearer/icd/qnetworksession_impl.cpp +++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp @@ -1082,14 +1082,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; |