summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-031-3/+3
|\
| * Fix for QTBUG-17035kranthi2011-02-021-3/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1752-637/+71
|\ \ | |/
| * Merge commit 'refs/merge-requests/959' of git://gitorious.org/qt/qt into inte...Lorn Potter2011-01-114-585/+20
| |\
| | * Fix ConnMan bearer plugin to use new net.connman service name.Leena Gunda2010-12-094-585/+20
| * | Update copyright year to 2011.Jason McDonald2011-01-1052-52/+52
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-071-2/+4
|\ \ \ | |/ /
| * | Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-061-2/+4
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-203-14/+96
|\ \ \ | |/ /
| * | Quiet unused parameter warnings.Aaron McCarthy2010-12-201-0/+3
| * | Fix possible null pointer dereference.Aaron McCarthy2010-12-151-3/+5
| * | Ensure that DBus is connected before all uses.Aaron McCarthy2010-12-152-11/+88
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-2/+2
|\ \ \ | |/ /
| * | Proxy mode was not correctly checked.Jukka Rissanen2010-12-081-2/+2
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-104-64/+35
|\ \
| * | minor clean-ups and styling fixesKonstantin Ritt2010-12-104-64/+35
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-064-6/+16
|\ \ \ | |/ / |/| / | |/
| * Fix proxy reading from gconf so that it is only done once / session.Jukka Rissanen2010-12-062-4/+15
| * Remove the FIXME, it's fixedThiago Macieira2010-11-281-1/+1
| * Fix warning about uninitialised varibale.Thiago Macieira2010-11-281-0/+1
| * Fix warnings related to unused variables.Thiago Macieira2010-11-261-2/+0
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+1
|\ \ | |/
| * Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-193-17/+36
|\ \ | |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Perttu Pohjonen2010-11-151-3/+3
| |\
| | * Fix for KERN-EXEC 0 caused by QNetworkAccessManager::getVille Pernu2010-11-121-3/+3
| * | Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWaitPerttu Pohjonen2010-11-152-14/+33
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-124-38/+53
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-113-37/+52
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7juhvu2010-11-102-36/+51
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-11-099-108/+39
| | | |\
| | | * | get rid of dependency on QtGuiLorn Potter2010-11-092-36/+51
| | * | | Removed implicity QtGui linking from icd.pro as it is not needed.juhvu2010-11-091-1/+1
| | | |/ | | |/|
| * | | Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| |/ /
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-081-1/+1
|\ \ \ | |/ /
| * | Task-number: QTBUG-15059juhvu2010-11-081-1/+1
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-061-1/+2
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-301-1/+2
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-301-1/+2
| | |\ \ \
| | | * | | Don't put Objective-C sources in SOURCESTor Arne Vestbø2010-10-271-1/+2
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-052-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix opening a network session multiple times in succession.Aaron McCarthy2010-11-051-1/+1
| * | | | Fix synchronous dispatch in ICD in non-main threads.Aaron McCarthy2010-11-051-0/+2
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-4/+4
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | dbus does not use this. fix build.Lorn Potter2010-10-291-4/+4
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-294-107/+36
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | remove the connecting thread, and use async call to dbus instead.Lorn Potter2010-10-294-107/+36
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-2/+2
|\ \ \ | |/ /
| * | Fixed many spelling errors.Rohan McGovern2010-10-252-2/+2
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-7/+3
|\ \ | |/