summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Kurt Korbatits2010-02-07129-578/+30579
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-02-051-0/+2
| |\
| | * Make sure include for QAudio namespace is createdJustin McPherson2010-02-051-0/+2
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0421-167/+435
| |\ \
| | * | My changes for 4.6.2Miikka Heikkinen2010-02-041-0/+18
| | * | Fixed the location where bootstrap.sis is looked for.Miikka Heikkinen2010-02-041-1/+1
| | * | Added support for smart installer package generation in SymbianMiikka Heikkinen2010-02-047-61/+160
| | * | Flush the WSERV command buffer after deleting a surface.Jason Barron2010-02-042-0/+7
| | * | Fix crash when multiple screens are reported from HAL.Jason Barron2010-02-041-11/+7
| | * | Initial support for S60 softkey icons.Janne Anttila2010-02-043-25/+180
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-047-70/+63
| | |\ \ | |/ / /
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-0479-217/+21238
| | |\ \
| | | * | Further bug fixes for enable/disables DEF files mechanism on SymbianIain2010-02-044-24/+40
| | * | | Revert "Daylight savings time for Symbian take 2"Janne Koskinen2010-02-043-46/+23
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-041-2/+7
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Rhys Weatherley's changes for 4.6.2Rhys Weatherley2010-02-041-2/+7
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0420-216/+805
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-0320-216/+805
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-033-9/+30
| | | |\ \ \
| | | | * | | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-031-1/+21
| | | | * | | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-031-1/+1
| | | | * | | Compile fix for non-Symbian compilersAlessandro Portale2010-02-031-7/+8
| | | * | | | Adjust rw base address for gui built with GCCE for Symbian OSIain2010-02-031-1/+2
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-02-03153-576/+9778
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt-s60-public into 4.6Janne Anttila2010-02-03331-1814/+13474
| | | | |\ \ \
| | | | * | | | S60 softkey refactoring (support for merging, priorities and menus)Janne Anttila2010-02-0313-183/+727
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-29177-1189/+3466
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-2613-188/+365
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Janne Koskinen2010-01-259105-15150/+24796
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Daylight savings time for Symbian take 2Janne Koskinen2009-12-283-23/+46
| * | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-0310-37/+111
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | / / | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Autotest: to be sure, generate .cpp files with the proper headers tooThiago Macieira2010-02-031-17/+40
| | * | | | | | | | Fix regression in clipped icon text on WindowsJens Bache-Wiig2010-01-132-1/+18
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-037-19/+53
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / /
| | * | | | | | | | Fixed QFileInfo::absolutePath() warning when running "qmake -project"Andreas Kling2010-02-031-1/+1
| | * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-02-031-0/+9
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | QTcpServer: Clarify thread affinity of incoming QTcpSocketMarkus Goetz2010-02-031-0/+9
| | * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-02-031-4/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.Bastian Bense2010-02-031-4/+4
| | * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-02-0347-246/+8355
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Updated my changelog entryDenis Dzyubenko2010-02-031-3/+8
| | | * | | | | | | | QNAM HTTP: Fix bug related to re-sending a requestMarkus Goetz2010-02-033-10/+27
| | | * | | | | | | | Adding my changes.Carlos Manuel Duclos Vergara2010-02-031-1/+4
| | * | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-02-02291-1634/+5050
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-2266-224/+700
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-201-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-201-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-209-24/+70
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Andreas Kling2010-01-20285-3483/+5402
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Remove erroneous warning in QFileInfo::absolutePath()Andreas Kling2010-01-121-2/+5