summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | Documentation fix.Casper van Donderen2011-07-141-10/+6
| * | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-142-2/+9
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / /
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-131-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Fix potential crash when clicking in a text editEskil Abrahamsen Blomfeldt2011-07-131-0/+1
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-121-2/+8
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Compensate for different rounding rule in CG engineJiang Jiang2011-07-121-2/+8
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-123-44/+117
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Check engine existence before increasing reference countJiang Jiang2011-07-121-3/+6
| | | * | | | | | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-07-111-0/+15
| | | * | | | | | Optimize text layout.Michael Brasser2011-07-113-25/+71
| | | * | | | | | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-115-2/+13
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Backporting fix for QTBUG-18716Tomi Vihria2011-07-115-2/+13
| * | | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-07-13159-2745/+4148
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-07-128-50/+58
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Merge remote branch 'review/master' into stagingJiang Jiang2011-07-128-50/+58
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-1210-128/+615
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix license header in qs60keycapture_p.h and qs60keycapture.cppHonglei Zhang2011-07-082-36/+36
| | | * | | | | | | | | Fixing WINSCW compile errormread2011-07-052-9/+14
| | | * | | | | | | | | whitespace fixesmread2011-07-052-37/+37
| | | * | | | | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-07-0513864-1041560/+2121177
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'newmmkey_sym'Honglei Zhang2011-07-048-91/+578
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Enable key capture and RemCon interfaces for Qt apps on SymbianHonglei Zhang2011-07-038-91/+578
| | * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-07-1213-27/+447
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-094-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-0863-748/+341
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Rename textBeforeOffsetFromString to start with q.Frederik Gladhorn2011-07-082-9/+9
| | | * | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-0712-50/+95
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Fix license header.Frederik Gladhorn2011-07-072-34/+34
| | | * | | | | | | | | | | | | | | Implement text interface for QLineEdit.Frederik Gladhorn2011-07-062-12/+140
| | | * | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-0553-1385/+1700
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Lion Support: Fix QSpinBox lookGabriel de Dietrich2011-07-052-1/+3
| | | * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-teamJan-Arve Saether2011-07-0511-504/+1032
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-0511-504/+1032
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Make this feature public for Qt 4.8 (was privately added for Qt 4.7)Jan-Arve Saether2011-07-051-2/+0
| | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | Lion Support: Hand made rendering of selected tab textGabriel de Dietrich2011-07-041-2/+20
| | | * | | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-0413781-1040180/+2118825
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Add DBus VirtualObject to handle multiple paths.Frederik Gladhorn2011-07-048-10/+284
| | * | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-122-9/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-112-9/+14
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-112-9/+14
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Fixing WINSCW compile errormread2011-07-112-9/+14
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-092-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Fix resource leak in symbian socket engineShane Kearns2011-07-081-0/+1
| | | * | | | | | | | | | | | | | | | | | Use memmove in QListData::append(int) as regions overlap.Thiago Macieira2011-07-081-1/+1
| | * | | | | | | | | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-082-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | / / / / / / / / / | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-086-160/+226
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-07-084-159/+222
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Flicking behaviour of ListView/GridView SnapOnItem is inconsistentMartin Jones2011-07-084-149/+196
| | | | | * | | | | | | | | | | | | | | Flickable is too sensitive.Martin Jones2011-07-081-1/+5