summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-0310-1505/+1499
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-027-41/+163
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-11-011-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-2815-51/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-10-273-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Notify X11 of its resizable state through MWM Hints.Jan-Arve Saether2011-10-271-1/+10
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-282-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | SSL: fix build when compiled with -openssl-linkedPeter Hartmann2011-11-282-0/+12
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-286-4/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-255-1/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | New API to set AVKON flag to inputcontext in Qt/Symbian.Satyam Bandarapu2011-11-255-1/+16
| * | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-251-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | Fixing memory leak in QtGui qt_cleanupJani Hyvonen2011-11-221-3/+0
* | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-2610-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-2210-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Doc: Fixing typoSergio Ahumada2011-08-1710-13/+13
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Symbian-linux crosscompilation case changesPasi Pentikainen2011-11-241-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-251-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Fixes for the manifest and links.Casper van Donderen2011-11-241-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-2416-198/+485
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Symbian: don't merge native clipboard, overwrite.Shane Kearns2011-11-221-0/+3
| | |_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Surviving out of memory in Qt Quick appmread2011-11-2110-194/+253