summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-11-1925-211/+491
|\ \ \ \ | |/ / /
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1214-100/+280
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-116-37/+146
| | |\ \ | | | |/ | | |/|
| | | * Coding style: bang cleanup.Michael Dominic K2010-11-111-10/+10
| | | * Removed call to glFinish, obsoleted by fence syncs.Michael Dominic K2010-11-111-1/+0
| | | * Plugin-side support for creating/destroying/waiting on fence sync.Michael Dominic K2010-11-114-13/+49
| | | * Added MeeGo graphicssystem entry points for KHR_fence_sync.Michael Dominic K2010-11-112-2/+76
| | | * Trailing whitespace fixes.Michael Dominic K2010-11-113-15/+15
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-114-46/+87
| | |\ \
| | | * \ 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-0929-383/+1102
| | | | |\ \
| | | | * | | 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
| | | | |/ / | | | |/| |
| | | * | | DFB: Make sure QPixmap::hasAlpha is respectedAnders Bakken2010-11-081-7/+27
| | | * | | Fix some painting issues in QDirectFBPaintEngineAnders Bakken2010-11-081-9/+15
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-101-1/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Use $${EPOCROOT} variable rather than absolute paths in .pro filesGareth Stockwell2010-11-101-1/+1
| | | |/ /
| | * | | Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| | * | | Doc: Fixing typoSergio Ahumada2010-11-092-3/+3
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-082-14/+44
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-052-14/+44
| | | |\ \
| | | | * | Doc: Fixing typoSergio Ahumada2010-11-031-3/+3
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-032-14/+44
| | | | |\ \
| | | | | * | Use 32bit textures for alpha textures after all.Michael Dominic K2010-11-022-2/+21
| | | | | * | One more fix for dithering.Michael Dominic K2010-11-021-8/+8
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-291-4/+15
| | | | | |\ \
| | | | | | * | 32bit => 16bit conversion has 4byte-aligned output.Michael Dominic K2010-10-291-4/+15
| * | | | | | | 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
| |\ \ \ \ \ \
| | * | | | | | Fixed whitespace.David Boddie2010-11-021-1/+1
| | * | | | | | Fixed destination path for the S60 feedback plugin.David Boddie2010-11-021-0/+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
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-291-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-11-031-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fixed destination path for the S60 feedback plugin.David Boddie2010-11-021-0/+2
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-305-4/+161
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | / / / / / | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-291-4/+4
| | |\ \ \ \ \
| | | * | | | | dbus does not use this. fix build.Lorn Potter2010-10-291-4/+4
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-294-0/+157
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Support tactile feeedback from QS60Style for QWidgetsSami Merila2010-10-294-0/+157
| * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-296-111/+49
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-294-107/+36
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | remove the connecting thread, and use async call to dbus instead.Lorn Potter2010-10-294-107/+36
| | * | | | Do not support QImage::Format_ARGB32 in meego gfx for egl images.Michael Dominic K2010-10-281-2/+1