summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-181-1/+1
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-181-1/+1
| |\
| | * Changed the localized vendor name for Qt SIS packages to "Nokia"Eckhart Koppen2011-02-171-1/+1
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-104-16/+17
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-081-1/+1
| |\ \ | | |/
| | * Fixed "not a valid preprocessing token" on GCCE.axis2011-02-041-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-02-031-5/+5
| |\ \
| | * | Doc: Fixed QML, unindented snippet.David Boddie2011-02-011-5/+5
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-01-312-10/+11
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-269-51/+315
| | |\
| | * | Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1350-54/+128
| | |\ \
| | * \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-156-6/+6
| | |\ \ \
| | * \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0723-195/+135
| | |\ \ \ \
| | * | | | | doc: Changed a table into 3 tables to eliminate a \raw.Martin Smith2010-10-251-9/+10
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-014-84/+76
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix alignment issue causing crash in QtScript/JavaScriptCoreKent Hansen2011-01-284-84/+76
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-267-39/+303
|\ \ \ \ \ \ | |/ / / / /
| * | | | | QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-257-39/+303
| * | | | | Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"Kent Hansen2011-01-258-309/+43
| * | | | | QtScript/JSC on Symbian: Enhanced memory allocator for Collector heapKent Hansen2011-01-258-43/+309
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-252-12/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix crash in QtScript/JSC stack allocator on SymbianKent Hansen2011-01-241-0/+6
| * | | | | Switch default Phonon backend on Symbian from Helix to MMFGareth Stockwell2011-01-191-12/+6
| | |_|_|/ | |/| | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1750-54/+128
|\ \ \ \ \ | |/ / / /
| * | | | Fixed resource leak in Phonon MMF backendRuth Sadler2011-01-111-0/+2
| * | | | Allow IAP to be selected in Phonon MMF backendRuth Sadler2011-01-1110-14/+86
| * | | | Update copyright year to 2011.Jason McDonald2011-01-1040-40/+40
| | |_|/ | |/| |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-112-6/+36
|\ \ \ \
| * \ \ \ Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-102-6/+36
| |\ \ \ \
| | * | | | Disable certain GPOS features by defaultJiang Jiang2010-12-201-6/+35
| | * | | | Move advances for control character in Indic syllable shapingJiang Jiang2010-12-201-0/+1
* | | | | | qt project files: create pkg-config files for mingwMark Brand2011-01-101-3/+1
|/ / / / /
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-206-6/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fixed several compile and deployment issues in the mmf phonon plugin.axis2010-12-146-6/+6
| | |/ | |/|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-065-83/+83
|\ \ \ | |/ /
| * | Phonon: Fix use of ASCII casting in the PulseAudio support.Thiago Macieira2010-11-261-74/+72
| * | Phonon: Fix unused parameter warningThiago Macieira2010-11-261-1/+1
| * | Phonon: Fix warning on casting from "false" to QFlags.Thiago Macieira2010-11-261-2/+2
| * | Phonon: Fix "value not in enum" warning with GCC 4.5.Thiago Macieira2010-11-261-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-251-5/+7
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-241-5/+7
| | |\ \
| | | * | Ensure that if this is does not have a valid filter when on XP or lessAndy Shaw2010-11-241-5/+7
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-255-19/+49
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-243-19/+37
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60axis2010-11-192-17/+35
| | |\ \ \
| | | * | | Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
| | | * | | Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-083-7/+30
| | | * | | Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-088-43/+211
| | | * | | Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-082-0/+305