summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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 remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-026-3/+14
|\ \ \ | |/ /
| * | 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 into 4.7Laszlo Agocs2011-04-2897-500/+1755
| |\ \
| * | | Upload VGImage data when drawing pixmaps that are being painted into.Laszlo Agocs2011-04-275-1/+9
| * | | 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-294-2/+61
|\ \ \ \
| * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-284-2/+61
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-271-0/+5
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Clear the root index when the model is reset.Girish Ramakrishnan2011-04-271-0/+5
| | | * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7Martin Jones2011-04-27220-1452/+6401
| | | |\ \
| | * | \ \ 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
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed off-by-one in radial gradient color table index computation.Samuel Rødal2011-04-281-4/+2
| | * | | | | | | | 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-2934-124/+935
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream'Thierry Bastian2011-04-28142-1113/+7200
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make QLineControl send accessibility updates.Frederik Gladhorn2011-04-277-7/+15
| * | | | | | | | | | | 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
| * | | | | | | | | | | Removing the "resetInternalData" slot in QAbstractProxyModelGabriel de Dietrich2011-04-262-26/+1
| * | | | | | | | | | | Typos in internal api docs.Frederik Gladhorn2011-04-221-2/+2
| * | | | | | | | | | | Merge branch 'master-upstream'Thierry Bastian2011-04-19793-82314/+55243
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed a crash on Windows XP with mingw in threaded-codeThierry Bastian2011-04-191-1/+1
| * | | | | | | | | | | | Totally kill MR 916Gabriel de Dietrich2011-04-1511-779/+385
| * | | | | | | | | | | | Fix licence headers again for MR 900Sergio Ahumada2011-04-142-9/+18
| * | | | | | | | | | | | Reverting merge request 916Gabriel de Dietrich2011-04-147-58/+70
| * | | | | | | | | | | | Reverting merge request 916Gabriel de Dietrich2011-04-142-1/+3
| * | | | | | | | | | | | Build fix on QMenuBarThierry Bastian2011-04-142-3/+1
| * | | | | | | | | | | | Fix licence headers again for MR 900Gabriel de Dietrich2011-04-142-20/+21
| * | | | | | | | | | | | Fix copyright and a few codestyle mistakesThierry Bastian2011-04-143-114/+113
| * | | | | | | | | | | | Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterfaceAurélien Gâteau2011-04-145-14/+14
| * | | | | | | | | | | | Make ctor and dtor of QAbstractMenuBarImpl inlineAurélien Gâteau2011-04-143-47/+3
| * | | | | | | | | | | | QAbstractMenuBarImpl::allowSetVisible => setVisibleAurélien Gâteau2011-04-144-14/+6
| * | | | | | | | | | | | Introduce menubar plugin systemAurélien Gâteau2011-04-144-1/+41
| * | | | | | | | | | | | Introduce QAbstractMenuBarImplAurélien Gâteau2011-04-147-299/+694
| * | | | | | | | | | | | Hide Q<Platform>MenuActionAurelien Gateau2011-04-145-10/+10