summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-12-301-1/+1
|\
| * 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-071-0/+6
| |\ \
| | * | Fix NB#290352 Qtwebprocess crashes @ QHttpNetworkReply::readAnySami Rosendahl2011-12-071-0/+6
* | | | 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
| | |/
| * | 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-063-5/+8
|\ \
| * | Symbian: allow apps to disable GL multisamplingmread2011-12-051-1/+4
| * | QSqlRelationalTableModel doesn't follow relations on the first columnHonglei Zhang2011-12-051-1/+1
| * | symbian - don't export qsymbianbearer.qtplugin twiceShane Kearns2011-12-021-3/+3
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-0522-48/+187
|\ \ \ | |/ /
| * | Correct client rect calculation for MCLmread2011-12-021-7/+4
| * | Symbian: Fix CBA display on application with multiple windowsMiikka Heikkinen2011-12-011-3/+3
| * | 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
| * | 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-301-0/+7
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-12-012-2/+15
|\ \ \ | |/ /
| * | QSQLITE support only one statement at a timeHonglei Zhang2011-11-302-2/+15
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-12-011-6/+14
|\ \ \
| * | | Remove more "unused variable" warningsGabriel de Dietrich2011-11-301-2/+2
| * | | QTreeView: fix crash when starting a drag with hidden columns.David Faure2011-11-301-4/+12
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-12-011-3/+21
|\ \ \ \
| * | | | Fix stack overwrite in QDBusDemarshallerSami Rosendahl2011-11-301-3/+21
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-302-22/+47
|\ \ \ \ \
| * | | | | Backport SMP safe initialisation of QNetworkConfigurationManagerShane Kearns2011-11-302-22/+47
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-291-227/+227
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix Symbian def-filePasi Pentikainen2011-11-291-227/+227
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-11-2933-3/+78
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix more permissions (no execute bit).Frederik Gladhorn2011-11-2226-0/+0
| * | | | Fix permission (no execute bit).Frederik Gladhorn2011-11-225-0/+0
| * | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-221-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-191-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-183-7/+36
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-1711-119/+79
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-168-48/+167
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-154-26/+35
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-1313-22/+60
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-126-27/+59
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-1112-6176/+6931
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-092-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | QGraphicsLayoutItem - bound constraint the minimum and maximum sizeJohn Tapsell2011-11-081-2/+68
| * | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-051-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-0414-9/+367
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \