summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-0152-104/+104
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Windows 7 - fix nativewifi bearer pluginShane Kearns2012-05-082-7/+21
| | | | | | | | | | | The plugin code only handled the 2 events from windows XP, while there are more events defined on vista/7. As the scan complete event was being ignored, updates did not complete. Task-number: QTBUG-24503 Change-Id: Ib1fd6883b0fd6962f61dab7830e577b9292163ef Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com> (cherry picked from commit b45f0418e34a73da1729376c540b312b14b8ffda)
* Compile on Mac OS X with unsupported/macx-clangBradley T. Hughes2012-04-271-1/+1
| | | | | | | | Clang does not allow implicit const to non-const conversion like gcc does. Fix this. Change-Id: I1448975e1935a54405c20851841f0559c7bb9d3d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* RR scheduler error handling for deleted active objectsMurray Read2012-02-201-2/+4
| | | | | | | | | | | | | | | | | | We have discovered that the active object ConnectionStarter could potentially leave after deleteing itself in RunL. If that were to happen, QtRRActiveScheduler::RunMarkedIfReady would have crashed when it asked the deleted active object to handle the error. Some active object deletion detection has been added to QtRRActiveScheduler::RunMarkedIfReady to protect against crashes. The ConnectionStarter active object has been modified so that even if it does leave, when running in CActiveScheduler, it still won't cause a crash and will clean itself up correctly. Task-number: ou1cimx1#979241 Change-Id: Iafa10b96bbd8bedfec82d6d546c7ffaf0557fd8b Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix online status checking in generic bearer plugin.Xizhi Zhu2012-02-151-1/+1
| | | | | | | | | | | | | QNetworkInterface::IsUp means the interface is up, but not necessarily connected. QNetworkInterface::IsRunning means the interface is up and connected. Cherry-picked from Qt5 / QtBase commit: c93ac6758606f64af7fe2bac6c8bb08391d218a7 Task-number: QTBUG-22873 Change-Id: Ieb544058814520b4292b496de2e4672214f3d00a Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* symbian - fix lockup when a network session is opened from its errorShane Kearns2012-01-131-6/+6
| | | | | | | | | | | | | | | When QNetworkAccessManager::get is called from the slot connected to QNetworkAccessManager::finished, this is equivalent to calling QNetworkSession::open from the slot connected to QNetworkSession::error. Close handles before emitting the error signal, instead of afterwards. Otherwise the session start would be silently cancelled in the above situation. Task-number: ou1cimx1#960395 Change-Id: I48cb376722e0169721fd33614a0b9280c17bdd62 Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1152-52/+52
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Symbian - prefer sessions started by this process to choose proxyShane Kearns2011-11-302-12/+48
| | | | | | | | | | | | When WLAN and 3G connections are both active, the proxy for the wrong connection may have been chosen in the case of plain sockets or QNetworkAccessManager with an invalid configuration. When enumarating active connections to choose a proxy, prefer a connection that was opened by this process. Task-number: QTBUG-22615 Task-number: ou1cimx1#930701 Reviewed-by: mread
* fix bearer crashShane Kearns2011-11-161-1/+1
| | | | | | Handle could be closed too early in some situations causing a panic. Reviewed-By: mread
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-10-281-5/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Symbian configuration parameter change for linux building Improve patch_capabilities script output. Fix QtSql autotest server addresses Update SQLite version number in legal document Update SQLite version mentioned in licence document Symbian Linuxification building case changes Fix FTP example to handle failure to open network session Use QBasicAtomicInt as a static variable FTP - fix interoperability issues with SIZE command QS60StyleAnimation exception safety Catch potential throw in ~QSymbianControl Fixed access to null threadData in ~QObjectPrivate Fix the build for makefile build system of Symbian Symbian - fix compile error when default configured
| * Symbian Linuxification building case changesPasi Pentikainen2011-10-201-5/+1
| | | | | | | | | | | | | | Changes the libraries to match the case of files for building Symbian in linux. Reviewed-by: Miikka Heikkinen
* | don't lock the global mutex if there is nothing to protectKonstantin Ritt2011-10-071-13/+1
| | | | | | | | | | | | | | according to Thiago, setting the pointer with the same values *is* thread-safe Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* | nativewifi bearer plugin: prefer DLL Safe Search modeKonstantin Ritt2011-10-071-14/+17
|/ | | | | | | by using QSystemLibrary instead of QLibrary Merge-request: 2655 Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
* symbian: Implement QNetworkConfiguration::purpose()Shane Kearns2011-09-202-1/+52
| | | | | | | | | | | | | QNetworkConfiguration::purpose() will now return translated values for the system SNAPs rather than always UnknownPurpose. e.g. the "Internet" SNAP returns PublicPurpose, and the WAP/MMS SNAPs return ServiceSpecificPurpose. IAPs inherit the purpose of the service network that contains them, unless the same IAP is present in more than one with conflicting purposes, in which case UnknownPurpose is returned. Task-Number: QTBUG-19166 Reviewed-By: mread
* Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-09-201-2/+1
|\
| * Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-1413-261/+233
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine_p.h src/network/ssl/qsslsocket_openssl.cpp
| * | Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdkOswald Buddenhagen2011-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the 10.7 SDK was specified explicitly then it would fail the check inside the pro file. So this ensures that this is accounted for. Task-number: QTBUG-20516 Merge-request: 2657 Reviewed-by: ossi
| * | remove obsolete defineOswald Buddenhagen2011-09-051-1/+0
| | |
* | | symbian bearer: fix tst_qnetworksession test failuresShane Kearns2011-09-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian is not reporting the expected KLinkLayerClosed event on the last RConnection handle. Instead, it reports the event KConfigDaemonFinishedDeregistrationStop, which indicates the nif plugin is being destroyed (this is followed by unload events) To fix, this event is treated the same as a link down event, and results in the state change to disconnected. Either there has been a behaviour change in the platform, or the test was previously run with another user of the API running in the background (e.g. WLAN wizard, connection monitor) which prevented the unload. Task-Number: QTBUG-21382 Reviewed-By: mread
* | | More accurately determine bearer type for symbian GPRS/3GShane Kearns2011-09-131-2/+34
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbian IAP records don't distinguish between GRPS/EDGE/3G/HSPA, although the phone knows what type of cell it is attached to. For the IAP records which are of packet data type (reported as KCommDbBearerWcdma), we now query the phone network mode to determine the bearer type to report. The Qt API doesn't distinguish GRPS/EDGE (both are "2G") The Symbian API doesn't distinguish 3G and HSPA unless there is an active connection. So we have to report both of these as WCDMA. When a connection becomes active, we update Qt's IAP record list to show the known connection type (which may include HSPA now). Qt already contained code to observe roaming between cell types, which reports all types. Note that the bearer type may change during connection (handover to another cell may occur), which should be covered by the already existing code. Task-Number: QTBUG-19011 Reviewed-By: mread
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-182-3/+3
|\ \ | |/
| * Fix non-ascii name issues in ICD.Xizhi Zhu2011-08-182-3/+3
| | | | | | | | | | PMO Bug 275663. Developed by Aapo Makela, reviewed by me.
| * Fixing WINSCW compile errormread2011-07-112-9/+14
| | | | | | | | | | | | | | | | Refactoring the body of a large TRAP into a separate function. This was not compiling on WINSCW, perhaps due to the use of #ifdef within the TRAP macro expansion. It does compile now. Reviewed-by: Sami Merila
* | Fixing WINSCW compile errormread2011-07-052-9/+14
| | | | | | | | | | | | | | | | Refactoring the body of a large TRAP into a separate function. This was not compiling on WINSCW, perhaps due to the use of #ifdef within the TRAP macro expansion. It does compile now. Reviewed-by: Sami Merila
* | whitespace fixesmread2011-07-052-37/+37
| | | | | | | | | | Making these whitespace fixes in preparation for fixing a compile error and my editor likes to fix whitespace.
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-012-4/+19
|\ \ | |/ | | | | | | Conflicts: src/s60installs/s60installs.pro
| * Fix KERN-EXEC 0 errors in symbian bearer pluginShane Kearns2011-06-282-4/+19
| | | | | | | | | | | | | | | | | | The plugin was ignoring errors when opening a handle, and as a result crashed if the handle was invalid. Error checking / handle validity checks added. Task-number: QTBUG-18572 Reviewed-by: mread
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-241-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qpixmap_raster_symbian.cpp src/gui/image/qpixmapdatafactory.cpp src/gui/painting/qgraphicssystem.cpp src/gui/styles/qs60style.cpp src/network/bearer/qnetworkconfigmanager_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
| * Workaround webkit deadlock on macos xShane Kearns2011-06-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The webkit AtomicallyInitializedStatic and Qt's Q_GLOBAL_STATIC can deadlock on the Mac, as the mac compiler inserts calls to __cxa_guard_acquire and __cxa_guard_release around initialisation of local statics. In Q_GLOBAL_STATIC case, this is the QGlobalStaticDeleter local static Whereas webkit AtomicallyInitializedStatic is a local static variable in any case. Problem is triggered because webkit constructs QNetworkConfigurationManager inside the constructor of a local static - networkStateNotifier And the generic bearer plugin calls QNetworkInterface::allInterfaces in the bearer thread, which needs an initialised Q_GLOBAL_STATIC. Reviewed-by: Laszlo Agocs
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-081-0/+1
|\ \ | |/
| * Update internal state before emitting configurationChanged() signals.Xizhi Zhu2011-06-081-0/+1
| | | | | | | | PMO Bug 257336.
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-311-2/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qtextengine.cpp src/gui/text/qtextengine_p.h src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro tests/auto/qtextlayout/tst_qtextlayout.cpp
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-261-2/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed more CI-errors caused by qmlshadersplugin addition. Fixed CI-errors caused by qmlshadersplugin addition. Fixing Linux compatibility issues for Symbian Update the detection of is_using_gnupoc for S3. Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1 Revert "Fixing Linux compatibility issues for Symbian" sockets: limit buffer size of the internal sockets in proxy engines
| | * | Revert "Fixing Linux compatibility issues for Symbian"Laszlo Agocs2011-05-251-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the library names to lowercase breaks 5.0-based Linux builds. It will be investigated if it is possible to change the SDKs instead. If not, the patch will have to be extended to use the original names for 5.0 and the lowercased ones otherwise. This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
* | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-251-0/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-251-0/+6
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the state of default network configuration.
| | * Fix the state of default network configuration.Xizhi Zhu2011-05-241-0/+6
| | | | | | | | | | | | | | | | | | | | | PMO Bug 257336 - Default configuration remains in QNetworkConfiguration::Active state even when device moves out of WLAN coverage This fix sets the default network configuration (of type UserChoice) back to Discovered when the network session is disconnected. Reviewed-by: Cristiano di Flora
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-241-7/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_ft.cpp src/gui/text/qtextlayout.cpp src/plugins/phonon/mmf/mmf.pro src/plugins/s60/5_0/5_0.pro src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtMultimediau.def src/s60installs/bwins/QtNetworku.def src/s60installs/bwins/QtScriptu.def src/s60installs/bwins/QtSqlu.def src/s60installs/bwins/QtTestu.def src/s60installs/bwins/QtXmlPatternsu.def src/s60installs/bwins/QtXmlu.def src/s60installs/bwins/phononu.def src/s60installs/s60installs.pro tests/auto/qcssparser/qcssparser.pro tests/auto/qtextlayout/tst_qtextlayout.cpp Changes in qtextlayout.cpp and tst_qtextlayout.cpp and qfontengine_ft.cpp are not merged because they will have other fixes in 4.8
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-05-181-7/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixing Linux compatibility issues for Symbian
| | * Fixing Linux compatibility issues for SymbianTomi Vihria2011-05-181-7/+2
| | | | | | | | | | | | Reviewed-by: Laszlo Agocs
| * | Update licenseheader text in source filesJyri Tahtela2011-05-1352-884/+884
| |/ | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1352-884/+884
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Revert "QNativeWifiEngine: Fix problem with wifi polling on Windows"Martin Petersson2011-04-181-5/+0
| | | | | | | | | | | | | | | | This reverts commit 2e7e8a2b805b868eade36cc44fa14bf8ca2f8c2f. This broke the QNetworkconfigurationManager auto tests. Reviewed-by: Peter Hartmann
* | QNativeWifiEngine: Fix problem with wifi polling on WindowsMartin Petersson2011-04-141-0/+5
| | | | | | | | | | | | | | | | | | | | On some Windows machines the wifi detection in QNativeWifiEngine::available does not work as WlanOpenHandle still succeed altough there is no WLAN card. So instead we can detect this using the WlanEnumInterfaces in requestUpdate() instead. Task-number: QTBUG-17219 Reviewed-by: Xizhi Zhu
* | Merge branch 'master' of scm.dev.troll.no:qt/qt-earth-team into ↵Shane Kearns2011-04-114-10/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | symbian-socket-engine Conflicts: src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtNetworku.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def src/s60installs/eabi/QtNetworku.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| * \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-242-10/+13
| |\ \ | | |/ | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| | * Fixes QT-4753Xizhi Zhu2011-03-232-10/+13
| | | | | | | | | | | | | | | | | | Invalid read in ICD plugin for bearer management. Reviewed-by: Iiro Kause
| * | Fix compilation with QT_NO_Tasuku Suzuki2011-03-212-0/+11
| | | | | | | | | | | | | | | Merge-request: 1132 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-251-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qhttpnetworkconnectionchannel.cpp src/network/socket/qlocalsocket.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtTestu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtGuiu.def
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-091-6/+6
| |\ \ | | |/
generated by cgit v0.12 at 2024-12-29 06:47:53 (GMT)