summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-181-0/+6
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-181-0/+6
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-181-0/+6
| | |\
| | | * Fixes leaking X11 SyncCounter when widgets get open/destroyedAleksandar Stojiljkovic2011-07-181-0/+6
* | | | namespace fixJoerg Bornemann2011-07-141-1/+2
|/ / /
* | | 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-113-2/+11
| |\ \
| | * | Backporting fix for QTBUG-18716Tomi Vihria2011-07-113-2/+11
* | | | 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
| |\ \ \ \
| | * | | | Fix compiler warning in qtextdocument.cppEskil Abrahamsen Blomfeldt2011-07-111-1/+1
| | * | | | Fix crash when app font is addedJiang Jiang2011-07-113-19/+28
| | * | | | Use truncate only for subpixel boundingBox x positionJiang Jiang2011-07-082-2/+2
| | * | | | Use more numerically robust algorithm to compute QBezier::pointAt().Samuel Rødal2011-07-081-18/+18
| | * | | | Fix editable combobox style on MacJiang Jiang2011-07-071-5/+5
| | * | | | Revert 344a4dcfe and part of 93bce787Jiang Jiang2011-07-072-6/+5
| | * | | | Fix raster subpixel positioning in LionJiang Jiang2011-07-071-1/+1
| | * | | | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-0715-206/+817
| | |\ \ \ \
* | | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-126-91/+568
|\ \ \ \ \ \ \
| * | | | | | | Fix license header in qs60keycapture_p.h and qs60keycapture.cppHonglei Zhang2011-07-082-36/+36
| * | | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-07-0526-281/+1181
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'newmmkey_sym'Honglei Zhang2011-07-046-91/+568
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Enable key capture and RemCon interfaces for Qt apps on SymbianHonglei Zhang2011-07-036-91/+568
* | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-091-1/+3
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-081-1/+3
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-081-1/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-071-1/+3
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | * | | | | | | | Regression: Some QMenus are shown completely transparent in SymbianSami Merila2011-07-071-1/+3
* | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-0832-122/+269
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-07-0819-8/+62
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-0817-212/+853
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | Doc: Fixed \since declarations.David Boddie2011-07-011-2/+2
| | * | | | | | | | | | Doc: Added more appropriate links to help reduce confusion.David Boddie2011-07-011-0/+2
| | * | | | | | | | | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-3017-6/+58
| * | | | | | | | | | | Merge remote branch 'mainline/4.8' into stagingJiang Jiang2011-07-0817-212/+853
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-072-2/+19
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-061-1/+13
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | | * | | | | | | Fix bidi reordering when part of text is rendered by fallback fontEskil Abrahamsen Blomfeldt2011-07-061-1/+13
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-061-1/+6
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | | * | | | | | | On symbian QMessageBox does not look like native dialogSami Merila2011-07-061-1/+6
| * | | | | | | | | | Fix S60 compileJiang Jiang2011-07-061-1/+1