summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* QLocalSocket/Win: handle ERROR_ACCESS_DENIEDJoerg Bornemann2011-04-051-0/+5
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-03-142-4/+14
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-03-142-4/+14
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-141-2/+5
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-149-14/+61
| | | |\
| | | * | QS60Style: QTreeView::indexRowSizeHint returns incorrect valueSami Merila2011-03-141-2/+5
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-141-2/+9
| | |\ \ \
| | | * | | Fix TextEdit mouseSelectionMode overriding selectByMouse.Andrew den Exter2011-03-141-2/+9
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-03-1416-68/+204
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master-upstream'Thierry Bastian2011-03-10277-1970/+7280
| |\ \ \ \ \ \
| * | | | | | | Merge request: 1111Richard Moe Gustavsen2011-02-251-0/+7
| * | | | | | | Mac: add support for closing dialogs using Cmd-DRichard Moe Gustavsen2011-02-211-0/+8
| * | | | | | | Cocoa: use mouse location from eventRichard Moe Gustavsen2011-02-182-3/+3
| * | | | | | | Cocoa: implement eventdispatcher flag excludeUserInputEventsRichard Moe Gustavsen2011-02-181-18/+42
| * | | | | | | Cocoa: processEvents does not always send posted eventsRichard Moe Gustavsen2011-02-171-2/+8
| * | | | | | | Merge branch 'master-upstream'Gabriel de Dietrich2011-02-15242-2126/+8306
| |\ \ \ \ \ \ \
| * | | | | | | | Added QMdiArea::tabsMovable and tabsClosableJ-P Nurmi2011-02-103-1/+94
| * | | | | | | | Merge branch 'master-upstream'Gabriel de Dietrich2011-02-08215-3544/+11602
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-203874-5152/+12160
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Enable the widthForHeight() test case.Jan-Arve Saether2011-01-191-1/+1
| * | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2541-380/+1397
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2412-86/+235
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed a double selection in QFileDialog when savingThierry Bastian2010-12-221-0/+1
| * | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2257-814/+736
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-212-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-1652-2920/+6097
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-1548-311/+522
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-142-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-11103-901/+1501
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-102-6/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-092-13/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | fix qFadeEffect windowOpacity issue on Windowsminiak2010-12-081-5/+3
| * | | | | | | | | | | | | | | | | | | | Cleanup unused QAccessWidgetminiak2010-12-081-17/+4
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-083-3/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-073-15/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-0520-1/+4312
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-041-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-0359-1186/+2141
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-023-15/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a problem with toolbars not relayoutingThierry Bastian2010-12-011-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-0111-66/+536
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-303-9/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-2711-116/+158
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-26108-543/+1240
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention when the role was introducedAlbert Astals Cid2010-11-251-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a way to set QHeaderView initial sort orderAlbert Astals Cid2010-11-253-16/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc: Fixing typoSergio Ahumada2010-11-251-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-234-4/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-03-142-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix static text item positioning GL2 paint engineJiang Jiang2011-03-111-2/+2