summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-021-21/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Detect linked fonts by name (insead of via CLinkedTypeface* Api)Alessandro Portale2011-08-021-21/+2
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-296-31/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-281-12/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Revert binary search in QTextEngine::findItemJiang Jiang2011-07-281-12/+6
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-271-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Remove a duplicate include lineLiang Qi2011-07-271-1/+0
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-273-9/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Save previous font engine for right bearing adjustmentJiang Jiang2011-07-271-5/+15
| | | * | | | | | | | | | | | Fix compilation under OSX 10.7 or using llvm-gcc.Mike McQuaid2011-07-261-4/+4
| | | * | | | | | | | | | | | Fix typo in QFontDialog docsJiang Jiang2011-07-251-1/+1
| | | * | | | | | | | | | | | Reset previousGlyph once we reached a new text itemJiang Jiang2011-07-251-0/+1
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-272-9/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Symbian^3 workaround: Avoid usage of linked fonts.Alessandro Portale2011-07-272-9/+62
* | | | | | | | | | | | | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-07-29208-22644/+44897
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-261-2/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Make it possible to update a related table after an external updateAndy Shaw2011-07-261-2/+34
| * | | | | | | | | | | | | | Add test case name and drop parentheses for -datatags option.Jo Asplin2011-07-261-10/+15
| * | | | | | | | | | | | | | Added -datatags option to QTestLibjasplin2011-07-262-0/+74
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-07-2524-72/+1783
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-232-2/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Build Qt for Symbian on Mac/gcce againLiang Qi2011-07-222-2/+5
| | * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-07-2222-69/+1780
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-191-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-154-20/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-142-2/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Add constants to QAccessible::Event enum.Frederik Gladhorn2011-07-141-34/+34
| | | * | | | | | | | | | | | | | Call QAccessible::updateAccessibility when setText is called on QLabelJosé Millán Soto2011-07-141-0/+9
| | | * | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-139-61/+65
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Style cleanup - space after flow control keywords.Frederik Gladhorn2011-07-131-3/+3
| | | * | | | | | | | | | | | | | | Add IAccessible2 table2 implementation.Frederik Gladhorn2011-07-1317-29/+1693
| | | * | | | | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-1210-137/+629
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Fix a crash with QGraphicsScene.Pierre Rossi2011-07-121-1/+2
| | | * | | | | | | | | | | | | | | | Use name for combobox on Unix.Frederik Gladhorn2011-07-122-5/+25
| | | * | | | | | | | | | | | | | | | QProgressBar: transparent background on Windows Vista (partId: PP_BAR -> PP_T...miniak2011-07-111-0/+17
| | * | | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-221-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Fix the timeout calculation again.Thiago Macieira2011-07-221-2/+2
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-222-5/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | / / / / / / | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-211-11/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fixed crash when loading 16 bits-per-pixel grayscale TIFs.Kim Motoyoshi Kalland2011-07-201-11/+20
| | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-07-211-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix compilation on Symbian platforms without SgImage supportJani Hautakangas2011-07-211-0/+4
| * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-215-6/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge remote-tracking branch 'earth-team/master'Olivier Goffart2011-07-205-6/+95
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | QNetworkAccessFileBackend: Add warning for file url without scheme.Martin Petersson2011-07-191-2/+3
| | | * | | | | | | | | | | | | Native memory mapped file supportShane Kearns2011-06-283-4/+67
| | | * | | | | | | | | | | | | Fix compiler warningShane Kearns2011-06-271-0/+1
| | | * | | | | | | | | | | | | Create QScopedResource classShane Kearns2011-06-271-0/+24
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-07-211-10/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Doc: Moved general notes about character conversion.David Boddie2011-07-181-10/+13
| | |/ / / / / / / / / / / / / /