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-05-022-0/+22
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-022-0/+22
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-022-0/+22
| | |\
| | | * Fix trailing whitespacesJani Hautakangas2011-05-022-2/+2
| | | * Fix for native child widget performance issue.Jani Hautakangas2011-05-022-0/+22
* | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-027-3/+75
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-027-3/+75
| |\ \ \ |/ / / / | | _ / | | /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-291-1/+1
| |\ \
| | * | Fix another case where QVariant::Invalid should be QVariant::UserTypeAndy Shaw2011-04-291-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-291-1/+1
| |\ \ \
| | * | | Fix missing glyphs for large fonts with QStaticText/GL/FreetypeEskil Abrahamsen Blomfeldt2011-04-291-1/+1
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-281-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix crash in raster on X11 when text contains unsupported charactersEskil Abrahamsen Blomfeldt2011-04-281-1/+1
| | |/ /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-287-1/+75
| |\ \ \ | | | |/ | | |/|
| | * | Made the autotest for drawing pixmaps with painter open more fail safe.Laszlo Agocs2011-04-281-8/+23
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-04-28910-3401/+74200
| | |\ \ | | |/ / | |/| |
| | * | Upload VGImage data when drawing pixmaps that are being painted into.Laszlo Agocs2011-04-276-1/+55
| | * | Make translucent windows working properly with OpenVG.Laszlo Agocs2011-04-271-0/+5
* | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-04-295-2/+66
|\ \ \ \
| * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-285-2/+66
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-272-0/+10
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Clear the root index when the model is reset.Girish Ramakrishnan2011-04-272-0/+10
| | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-271481-19738/+104595
| | | |\ \
| | * | \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-271-2/+6
| | |\ \ \ \
| | | * | | | Fixed QTBUG-11935 : "With MySQL version > 50000 the QMYSQLDriver::Emmanuel BOURGERIE2011-04-271-4/+4
| | | * | | | Fixed QTBUG-11935Emmanuel BOURGERIE2011-04-271-2/+6
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-272-0/+50
| | |\ \ \ \ \
| | | * | | | | Legal: add the license header to the hand-editsThiago Macieira2011-04-272-0/+50
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-293-7/+15
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'qt-fire-review/master'aavit2011-04-283-7/+15
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-281-4/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fixed off-by-one in radial gradient color table index computation.Samuel Rødal2011-04-281-4/+2
| | * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-282-3/+13
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Support more items for QTextCharFormat::VerticalAlignment enum for custom tex...Dmitry Zelenkovsky2011-04-282-3/+13
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-04-2947-440/+1738
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master-review' into master-stagingThierry Bastian2011-04-28285-2093/+31225
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-04-28284-2091/+31223
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream'Thierry Bastian2011-04-28274-1875/+31163
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Make QLineControl send accessibility updates.Frederik Gladhorn2011-04-277-7/+15
| | | * | | | | | | | | | | | Fix warning (unused variable) in QAccessibility test.Frederik Gladhorn2011-04-271-2/+2
| | | * | | | | | | | | | | | Add accessible events as defined by IAccessible2.Frederik Gladhorn2011-04-271-0/+36
| | | * | | | | | | | | | | | Return name and allow actions for invisible accessible items.Frederik Gladhorn2011-04-271-11/+2
| | | * | | | | | | | | | | | Skip child count test on Intel compiler.Frederik Gladhorn2011-04-271-0/+6
| | | * | | | | | | | | | | | Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-04-264-198/+1
| | * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-04-221-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Typos in internal api docs.Frederik Gladhorn2011-04-221-2/+2
| | * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-04-212231-109701/+148635
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Fix tst_QTableWidget::task219380_removeLastRowGabriel de Dietrich2011-04-211-3/+2
| | * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-04-1914-12/+1135
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-04-112-35/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \