summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engineRichard Moe Gustavsen2011-01-191-10/+4
* Merge remote branch 'alien-on-cocoa/master' into alien-merged-mainlineRichard Moe Gustavsen2011-01-181-1/+6
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-171-1/+3
| |\
| | * Fix double click event on Mac OS X.Fabien Freling2011-01-171-1/+3
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alie...Richard Moe Gustavsen2011-01-171182-3818/+9580
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171147-1311/+1269
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-131-3/+2
| | |\
| | | * Proper fix for QGraphicsItem crash.Yoann Lopes2011-01-131-3/+2
| | * | Allow use of command line parameters with RApaLsSession::StartApp.Miikka Heikkinen2011-01-111-15/+14
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-101146-1148/+1148
| | |\
| | | * QFont/Windows: restrict the pixel size accuracyJoerg Bornemann2011-01-101-1/+1
| | | * Update copyright year to 2011.Jason McDonald2011-01-101146-1147/+1147
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-102-1/+10
| | |\ \
| | | * | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-102-1/+10
| | | |/
| | * | Merge branch 'graphics-team-text-4.7' into 4.7Eskil Abrahamsen Blomfeldt2011-01-101-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Fix crash in QTextBlock::next()/previous()Jiang Jiang2011-01-071-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-0722-24/+26
| | |\ \
| | | * | Fixes crash in QGraphicsItem's destructor.Yoann Lopes2011-01-071-1/+3
| | | * | Doc: Fixing typoSergio Ahumada2011-01-0721-23/+23
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-01-077-84/+21
| | |\ \ \
| | | * \ \ Merge branch 'review-4.7' into staging-4.7Gabriel de Dietrich2011-01-077-84/+21
| | | |\ \ \
| | | | * | | Fix crash when closing QFontDialog::getFont() dialogGabriel de Dietrich2011-01-031-0/+9
| | | | * | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-234-12/+57
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-222-28/+109
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-212-35/+55
| | | | |\ \ \ \ \
| | | | * | | | | | Fix timer warning when deleting item viewsGabriel de Dietrich2010-12-211-2/+9
| | | | * | | | | | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-164-12/+31
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Remove support for automatic tactile feedback from QS60StyleSami Merila2010-12-164-80/+1
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7Sami Merila2010-12-162-14/+3
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Remove warning about null cursor handle on S60 while handle is validPaul Labedan2010-12-151-2/+2
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-073-36/+48
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-063-36/+48
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-043-36/+48
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-303-36/+48
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-233-36/+48
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|/ / | | | | | | |/| | | | | | |
| | | | | | | * | | | | | | improve performance of QTextEngine, esp. setBoundary by using non-detaching o...Milian Wolff2010-12-231-7/+7
| | | | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-232-29/+41
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-222-29/+41
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|/ / | | | | | | | | |/| | | | | |
| | | | | | | | | * | | | | | Work around an apparent GCC optimiser bug accessing arrays beyond endThiago Macieira2010-12-221-28/+40
| | | | | | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-211-1/+1
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |_|_|_|/ / | | | | | | | | | |/| | | | |
| | | | | | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-211-1/+1
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * | | | | Fixed QStatusBar not to repaint itself too earlyDenis Dzyubenko2010-12-201-1/+1
| | | | | | | | | | | | |_|/ / | | | | | | | | | | | |/| | |
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-121-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Mac: pixmaps dont treat alpha exactly the same as other platformsRichard Moe Gustavsen2011-01-121-1/+5
| * | | | | | | | | | | | | | | Doc: Fixing typoSergio Ahumada2011-01-121-1/+1
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1111-12/+190
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-1111-12/+190
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2011-01-106-12/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-1011-12/+190
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Compile when qreal != doubleEskil Abrahamsen Blomfeldt2011-01-101-1/+1