summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-0973-42676/+16117
|\
| * WINSCW def file update so that qtgui can pick up virtual from qtcoremread2011-11-091-2/+3
| * Add mobile-reduced ts-files for Symbian.Pasi Pentikainen2011-11-0969-42665/+15959
| * Preventing zero-timer lockups when Symbian's active scheduler usedmread2011-11-083-9/+155
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-081-1/+3
|\ \ | |/
| * Fix memory leak in S60StyleMiikka Heikkinen2011-11-081-1/+3
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-082-91/+68
|\ \ | |/
| * Improve whatlog generation for Symbian tools2 builds.Miikka Heikkinen2011-11-032-91/+68
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-01105-2109/+14530
|\ \ | |/
| * Correct faulty 4.7->4.8 merge of Symbian def-filesLiang Qi2011-11-012-1482/+1473
| * Merge remote-tracking branch 'qt/4.8'Pasi Pentikainen2011-11-01105-634/+13064
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-011-1/+1
| | |\
| | | * SSL documentation: correct enum namePeter Hartmann2011-10-311-1/+1
| | * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-10-314-2/+116
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-314-2/+116
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-10-281-1/+1
| | | | |\ \
| | | | | * | Symbian - disable memory mapping in QNetworkDiskCacheShane Kearns2011-10-281-1/+1
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-10-279-59/+127
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | Merge remote-tracking branch 'upstream/4.7' into 4.7Sergio Ahumada2011-10-274-2/+27
| | | | | |\ \ | | | | | |/ / | | | | |/| |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-10-272-0/+25
| | | | |\ \ \
| | | | | * | | Adding items to a view with no delegate crashes.Martin Jones2011-10-272-0/+25
| | | | | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-217-62/+37
| | | | | | |\ \
| | | | | | | * | Fix security problem on webpage due to bad JSCasper van Donderen2011-10-215-59/+2
| | | | | | | * | Accepting predicted text using hardware keyboard replaces unwanted partSami Merila2011-10-212-3/+35
| | | | | | * | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-10-21132-716/+1892
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | Doc: adding link to the Qt Quick Components for Symbian page.Jerome Pasion2011-10-214-0/+125
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-10-311-0/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Updated changelog for Qt 4.8Jo Asplin2011-10-311-0/+2
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-10-311-1/+4
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix QFile::copy() returning false but error() being NoErrorxiechyong2011-10-311-1/+4
| | * | | | | | | | 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 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