summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | 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 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