summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2011-01-111-0/+2
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-10191-191/+191
| | |\
| | * | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-101-0/+2
| * | | 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-10191-191/+191
| | |/ | |/|
| * | Merge branch 'review-4.7' into staging-4.7Gabriel de Dietrich2011-01-074-159/+0
| |\ \
| | * \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-201-0/+3
| | |\ \
| | * | | Remove support for automatic tactile feedback from QS60StyleSami Merila2010-12-164-159/+0
* | | | | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-111-14/+2
* | | | | 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 branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-051-6/+2
|\ \ \ \ \ | |/ / / /
| * | | | Pre-create the GL share widget before window surface creation.Michael Dominic K2011-01-041-6/+2
| | |/ / | |/| |
* | | | Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-231-1/+1
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-204-15/+97
|\ \ \ \ | |/ / /
| * | | 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
| * | Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-141-2/+2
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-133-7/+17
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-12-082-5/+15
| |\ \
| | * | Use a different dither distribution matrix + a bit of rand.Michael Dominic K2010-12-081-4/+7
| | * | Make sure QMeeGoGraphicsSystem::setTranslucent can't be called if surface alr...Michael Dominic K2010-12-081-1/+8
| | |/
| * | 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
* | Fix spelling mistake in QEGLPlatformcontextJørgen Lind2010-12-014-4/+4
* | Merge remote branch 'origin/master' into lighthouse-masterJørgen Lind2010-11-298-33/+68
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-255-4/+6
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-241-1/+1
| | |\
| | | * Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-231-0/+2
| | | |\
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-191-1/+1
| | | |\ \
| | | | * \ Merge remote branch 'qt/4.7' into 4.7Jason McDonald2010-11-184-31/+64
| | | | |\ \
| | | | * | | Bump Qt version to 4.7.2.Jason McDonald2010-11-121-1/+1
| | * | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-221-0/+2
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-191-0/+2
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Compile with QT_NO_PROXYSCREEN.Sam Magnuson2010-11-191-0/+2
| | | | | |/ | | | | |/|
| | * | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-192-2/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Doc: Fixing typoSergio Ahumada2010-11-162-2/+2
| | | |/ /
| | * | | Tactile Feedback plugin is not compiled in latest Sym^3 RnD envsSami Merila2010-11-182-2/+2
| | |/ /
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-194-31/+64
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Perttu Pohjonen2010-11-151-3/+3
| | |\ \