diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-14 03:13:30 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-14 03:13:30 (GMT) |
| commit | 2115c915ee0bb129ae6af82dce7138d52df7bfd7 (patch) | |
| tree | 0da1ba2ee77e6bff81521d05536faf2819f77bd3 /src/plugins/bearer | |
| parent | 75c4dea93ad415dd9c79cb57ec5598e38789b28d (diff) | |
| parent | 124e9a761b3cab7414d3ddeaa8e8f2455b6598ad (diff) | |
| download | Qt-2115c915ee0bb129ae6af82dce7138d52df7bfd7.zip Qt-2115c915ee0bb129ae6af82dce7138d52df7bfd7.tar.gz Qt-2115c915ee0bb129ae6af82dce7138d52df7bfd7.tar.bz2 | |
Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squash
Diffstat (limited to 'src/plugins/bearer')
| -rw-r--r-- | src/plugins/bearer/symbian/qnetworksession_impl.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/symbian.pro | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp index ce2203d..3cd18fb 100644 --- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp +++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp @@ -1040,7 +1040,7 @@ void QNetworkSessionPrivateImpl::RunL() #endif if (publicConfig.type() == QNetworkConfiguration::UserChoice) { serviceConfig = QNetworkConfigurationManager() - .configurationFromIdentifier(symbianConfig->serviceNetworkPtr->id); + .configurationFromIdentifier(symbianConfig->id); } symbianConfig->mutex.unlock(); diff --git a/src/plugins/bearer/symbian/symbian.pro b/src/plugins/bearer/symbian/symbian.pro index f915570..4f1e51c 100644 --- a/src/plugins/bearer/symbian/symbian.pro +++ b/src/plugins/bearer/symbian/symbian.pro @@ -11,6 +11,7 @@ SOURCES += symbianengine.cpp \ main.cpp symbian { + TARGET.UID3=0x20021319 exists($${EPOCROOT}epoc32/release/winscw/udeb/cmmanager.lib)| \ exists($${EPOCROOT}epoc32/release/armv5/lib/cmmanager.lib) { message("Building with SNAP support") |