summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'symbian-socket-engine' of scm.dev.troll.no:qt/qt-symbian-networ...Shane Kearns2011-03-082-142/+138
|\
| * Refactor dangerous multiple inheritanceShane Kearns2011-02-212-25/+86
| * Fix RConnection handle leak in symbian bearer pluginShane Kearns2011-02-212-56/+40
| * Remove open C setdefaultif support from symbian QNetworkSessionShane Kearns2011-02-212-68/+3
| * Explicit network session for QNetworkAccessManagerShane Kearns2011-02-172-1/+7
| * Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2011-02-07249-2258/+7651
| |\
| * | Fix random crashes when bearer suddenly goes downShane Kearns2011-02-041-3/+3
| * | Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-121-2/+4
| * | Merge remote branch 'qt/master' into symbian-socket-engineShane Kearns2010-12-1528-213/+234
| |\ \
| * | | default RConnection for socketsShane Kearns2010-12-071-0/+10
* | | | Merge remote branch 'earth/master' into symbian-socket-engineShane Kearns2011-03-08269-2604/+8269
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-236-20/+41
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-231-0/+5
| | |\ \ \
| | | * | | add gsm to connectable bearer for networkmanager.Lorn Potter2011-02-231-0/+5
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-205-20/+36
| | |\ \ \ \ | | | |/ / /
| | | * | | Prevents crashing when ICO file has bad color table valueMauri Vehniäinen2011-02-181-0/+2
| | | * | | directfb: fix crash in client/server mode of qwsDenis Oliver Kropp2011-02-172-16/+31
| | | * | | Make Qt/DirectFB less verbose about failing to load pixmaps.Anders Bakken2011-02-171-3/+2
| | | * | | fix-layer-getsurface-result-check-for-screen-size-determinationDenis Oliver Kropp2011-02-171-1/+1
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-95/+52
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-171-95/+52
| | |\ \ \ \
| | | * | | | RGBA32 -> RGB565 dithering in Meego Graphicssystem,Tero Tiittanen2011-02-171-95/+52
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-175-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-145-3/+3
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Rename 'plugins\qmldebugging' (work around qmake issues)Kai Koehne2011-02-115-3/+3
| * | | | | | Merge branch earth-team/master into earth-stagingJoão Abecasis2011-02-161-0/+6
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-31249-2235/+7546
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'windowsMakefileBuildSupport' into earth-masteraxis2011-01-281-0/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fixed a build library deployment issue in sqlite.axis2011-01-281-0/+6
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-103-24/+10
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-02-082-19/+5
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Use the thread-default glib context for the DBus connection in the ICD bearer...Jocelyn Turcotte2011-02-081-1/+1
| | | * | | | | | | | directfb: Pixmap creation always premultiplied the alpha even when it is alre...Denis Oliver Kropp2011-02-041-18/+4
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-081-3/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix random crashes when bearer suddenly goes downShane Kearns2011-02-041-3/+3
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-3/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc: Fixed qdoc warning.David Boddie2011-01-251-3/+3
| * | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-106-2/+281
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-046-2/+281
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-041-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Fixed library casing.axis2011-02-031-1/+1
| | | | |/ / / / / / / /
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-035-2/+280
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19196-935/+216
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-073-8/+9
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Joona Petrell2010-12-204-16/+95
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | QDeclarativeDebug: Move Tcp server to separate pluginKai Koehne2010-12-175-2/+280
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-02-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Use the thread-default glib context for the DBus connection in the ICD bearer...Jocelyn Turcotte2011-02-091-1/+1
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-032-4/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-02-031-1/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | / / | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |