summaryrefslogtreecommitdiffstats
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-296-31/+88
|\
| * 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 branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-262-2/+57
|\ \ \ \
| * | | | Make it possible to update a related table after an external updateAndy Shaw2011-07-262-2/+57
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-07-2622-9/+366
|\ \ \ \ \
| * | | | | Add test case name and drop parentheses for -datatags option.Jo Asplin2011-07-265-44/+49
| * | | | | Adding QTDIR validation in tst_symbols autotestSergio Ahumada2011-07-261-0/+8
| * | | | | Disabled benchmarks referring to private headers.Jo Asplin2011-07-263-6/+3
| * | | | | Add license header to printdatatags autotestsSergio Ahumada2011-07-262-0/+84
| * | | | | Compile on symbian^3Jo Asplin2011-07-264-1/+19
| * | | | | Compile on Symbian^3.Jo Asplin2011-07-261-0/+5
| * | | | | Added -datatags option to QTestLibjasplin2011-07-2612-1/+241
| * | | | | Fixed failure of tst_qxmlquery::evaluateToReceiverRohan McGovern2011-07-261-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-252-6/+10
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-07-2525-80/+2145
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | 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-2223-77/+2142
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-2050-3762/+2342
| |\ \ \ \ \ \ \
| | * | | | | | | Remove testing for Hide of mainwindow.Frederik Gladhorn2011-07-201-4/+0
| | * | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-191-0/+6
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-188-3549/+81
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix accessibility test for QWS.Frederik Gladhorn2011-07-181-0/+3
| | * | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-158-62/+60
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix test for win and mac.Frederik Gladhorn2011-07-141-3/+3
| | * | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-145-19/+11
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | 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
| | * | | | | | | | | | | Fix autotest for accessible tables.Frederik Gladhorn2011-07-141-50/+97
| | * | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-1310-61/+86
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Style cleanup - space after flow control keywords.Frederik Gladhorn2011-07-131-3/+3
| | * | | | | | | | | | | | Add IAccessible2 table2 implementation.Frederik Gladhorn2011-07-1318-29/+2001
| * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-1212-137/+889
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-1212-137/+889
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-121-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Fix a crash with QGraphicsScene.Pierre Rossi2011-07-121-1/+2
| * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-122-5/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Use name for combobox on Unix.Frederik Gladhorn2011-07-122-5/+25
| * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-07-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /