summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-10-2819-86/+81
|\
| * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-261-2/+2
| |\
| | * Symbian configuration parameter change for linux buildingPasi Pentikainen2011-10-261-2/+2
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-261-7/+8
| |\ \ | | |/
| | * Improve patch_capabilities script output.Miikka Heikkinen2011-10-261-7/+8
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-251-2/+8
| |\ \ | | |/
| | * Fix QtSql autotest server addressesHonglei Zhang2011-10-251-2/+8
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-251-1/+1
| |\ \ | | |/
| | * Update SQLite version number in legal documentHonglei Zhang2011-10-251-1/+1
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-241-1/+1
| |\ \ | | |/
| | * Update SQLite version mentioned in licence documentHonglei Zhang2011-10-241-1/+1
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-205-30/+6
| |\ \ | | |/
| | * Symbian Linuxification building case changesPasi Pentikainen2011-10-205-30/+6
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-203-26/+37
| |\ \ | | |/
| | * Fix FTP example to handle failure to open network sessionShane Kearns2011-10-192-24/+35
| | * Use QBasicAtomicInt as a static variableShane Kearns2011-10-191-2/+2
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-186-15/+16
| |\ \ | | |/
| | * FTP - fix interoperability issues with SIZE commandShane Kearns2011-10-181-2/+2
| | * QS60StyleAnimation exception safetymread2011-10-182-9/+5
| | * Catch potential throw in ~QSymbianControlmread2011-10-181-1/+5
| | * Fixed access to null threadData in ~QObjectPrivatemread2011-10-181-2/+3
| | * Fix the build for makefile build system of SymbianLiang Qi2011-10-181-1/+1
| * | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-10-181-3/+3
| |\ \ | | |/
| | * Symbian - fix compile error when default configuredShane Kearns2011-10-181-3/+3
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast...Qt Continuous Integration System2011-10-282-2/+2
|\ \ \
| * | | Revert "Fixed deployment problems with MSVC 2005 and 2008 SP1"Joerg Bornemann2011-10-282-2/+2
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-10-281-0/+6
|\ \ \
| * | | QIODevice - disallow setTextMode when not openShane Kearns2011-10-271-0/+6
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-271-1/+1
|\ \ \ \
| * | | | Harfbuzz shaper: kerning adjustment does not need to be modified by RTLJohn Tapsell2011-10-271-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-10-273-1/+15
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-10-2660-376/+10966
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-10-2657-375/+10951
| | |\ \ \ \ \
| | * | | | | | Fix possible crash in glyph cache when deleting and creating contextsEskil Abrahamsen Blomfeldt2011-10-253-1/+15
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-269-59/+14
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-10-26206-1607/+5879
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-2110-59/+98
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/4.8'Casper van Donderen2011-10-2110-59/+98
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-215-59/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Fix security issue on website due to bad JS.Casper van Donderen2011-10-215-59/+2
| | * | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-20204-1508/+5815
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtJerome Pasion2011-10-19201-1508/+5803
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | * | | | | | | | | Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-194-0/+12
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-261-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Update changelog for Qt 4.8Mark Brand2011-10-261-0/+7
* | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-10-2634-108/+497
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-2534-108/+497
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integr...Qt Continuous Integration System2011-10-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Doc: Fix example codeSergio Ahumada2011-10-211-1/+1
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \