summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAny"Sergio Ahumada2011-12-311-44/+0
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-12-301-0/+2
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integr...Qt Continuous Integration System2011-12-301-0/+2
| |\
| | * Doc: Add `-xunitxml' option to qtestlib documentationSergio Ahumada2011-12-301-0/+2
| |/
* | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-12-302-1/+45
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-12-161-1/+1
| |\
| | * Fix crash in positionInLigatureJiang Jiang2011-12-161-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-12-072-0/+50
| |\ \
| | * | Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAnySami Rosendahl2011-12-072-0/+50
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-12-073-40/+352
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-11-303-40/+352
| |\ \ \ | | | |/ | | |/|
| | * | Fix HarfBuzz Thai character SARA AM handlingJiang Jiang2011-11-303-40/+352
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-11-301-14/+26
| |\ \ | | |/ | |/|
| | * Reduce unnecessary QtCore DLL loads during Symbian app thread creationmread2011-11-301-14/+26
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-064-5/+63
|\ \
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-064-5/+63
| |\ \
| | * | Symbian: allow apps to disable GL multisamplingmread2011-12-051-1/+4
| | * | QSqlRelationalTableModel doesn't follow relations on the first columnHonglei Zhang2011-12-052-1/+56
| | * | symbian - don't export qsymbianbearer.qtplugin twiceShane Kearns2011-12-021-3/+3
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-12-062-4/+0
|\ \ \ \
| * | | | Fix declarative examples and demos issue on WindowsDaniel Molkentin2011-12-062-4/+0
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-12-050-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-12-04547-312/+733
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-0524-49/+237
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-021-7/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Correct client rect calculation for MCLmread2011-12-021-7/+4
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-011-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Symbian: Fix CBA display on application with multiple windowsMiikka Heikkinen2011-12-011-3/+3
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-12-0123-39/+230
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix def filesJani Hautakangas2011-12-012-2/+2
| | * | | | | doc - document symbian behaviour of QFile::linkShane Kearns2011-11-301-2/+1
| | * | | | | Symbian - prefer sessions started by this process to choose proxyShane Kearns2011-11-307-14/+137
| | * | | | | Freezing Def files in QtSatyam Bandarapu2011-11-308-1/+24
| | * | | | | Lightmaps demo Symbian fixMarko Kenttala2011-11-301-1/+1
| | * | | | | CBA comes on top of option menuAri Lehtola2011-11-301-2/+7
| | * | | | | Fix memory leaks in OpenVG and OpenGL resource poolsJani Hautakangas2011-11-303-19/+4
| | * | | | | Fix sqlite driver memory eating due to close failureHonglei Zhang2011-11-302-0/+56
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-12-052-4/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | qmlplugindump: Fix missing flush for objects that don't fit a line.Christian Kamm2011-12-021-2/+1
| * | | | | | qmlplugindump: Avoid reporting types as attaching to themselves.Christian Kamm2011-12-021-2/+6
|/ / / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-12-023-14/+15
|\ \ \ \ \ \
| * | | | | | Fix QtDemo declarative examplesAlan Alpert2011-12-022-9/+10
| * | | | | | Correct image paths for dynamicsceneAlan Alpert2011-12-021-5/+5
|/ / / / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-013-2/+62
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-303-2/+62
| |\ \ \ \ \ | | |/ / / /
| | * | | | QSQLITE support only one statement at a timeHonglei Zhang2011-11-303-2/+62
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-12-012-25/+40
|\ \ \ \ \ \
| * | | | | | Remove more "unused variable" warningsGabriel de Dietrich2011-11-301-2/+2
| * | | | | | QTreeView: fix crash when starting a drag with hidden columns.David Faure2011-11-302-23/+38
| * | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-3044-0/+0
| |\ \ \ \ \ \