diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-06-30 06:54:11 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-06-30 06:54:11 (GMT) |
commit | 730511f15bd619319e99fba484cf415b87a38052 (patch) | |
tree | 0f39f88eb6da4cc9518bf5365697514144c419b0 /src | |
parent | 8987c745c6744e383463ed95e1da99b97f786aef (diff) | |
parent | ff3f0e9d43921d9a747521fd0d8730f66c26c8fc (diff) | |
download | Qt-730511f15bd619319e99fba484cf415b87a38052.zip Qt-730511f15bd619319e99fba484cf415b87a38052.tar.gz Qt-730511f15bd619319e99fba484cf415b87a38052.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/bearer/symbian/qnetworksession_impl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp index b6e11df..f89ed0a 100644 --- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp +++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp @@ -1303,7 +1303,8 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint #ifdef OCC_FUNCTIONALITY_AVAILABLE // If the retVal is not true here, it means that the status update may apply to an IAP outside of // SNAP (session is based on SNAP but follows IAP outside of it), which may occur on Symbian^3 EasyWlan. - if (retVal == false && activeConfig.d.data() && activeConfig.d.data()->numericId == accessPointId) { + if (retVal == false && activeConfig.isValid() && + toSymbianConfig(privateConfiguration(activeConfig))->numericIdentifier() == accessPointId) { #ifdef QT_BEARERMGMT_SYMBIAN_DEBUG qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed G to: " << state; #endif @@ -1311,7 +1312,7 @@ bool QNetworkSessionPrivateImpl::newState(QNetworkSession::State newState, TUint activeConfig = QNetworkConfiguration(); } state = newState; - emit q->stateChanged(state); + emit stateChanged(state); retVal = true; } #endif |