summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-041-1/+1
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-041-1/+1
| |\
| | * Added image conversion flag to prevent conversions.Samuel Rødal2011-03-041-1/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-032-0/+8
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-0115-143/+391
| |\ \
| * | | Add internal function for releasing cached GPU resources.Jani Hautakangas2011-03-012-0/+8
* | | | 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
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Prevent recursion when creating window surface.Samuel Rødal2011-02-021-1/+7
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Fix for QTBUG-17035kranthi2011-02-021-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-26198-959/+225
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17198-937/+217
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-111-0/+3