summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-169-65/+79
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-161-1/+4
| |\
| | * Added automatic graphicssystem switching on meego when app is minimized.Samuel Rødal2011-03-161-1/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-151-2/+2
| |\ \
| | * | Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-151-2/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-151-22/+25
| |\ \ \ | | | |/ | | |/|
| | * | Adjust right bearing when breaking with line separatorsJiang Jiang2011-03-151-22/+25
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-155-36/+44
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-03-151-6/+8
| | |\ \
| | | * | Avoid panics in QDesktopWidget on Symbian emulator.Laszlo Agocs2011-03-151-6/+8
| | * | | QS60Style: use placeholder texture when polishing widgets and paletteSami Merila2011-03-153-7/+33
| | * | | Regression: QS60Style: Theme background is incorrectSami Merila2011-03-151-0/+1
| | |/ /
| | * | Remove changes from fix to QTBUG-17045 that were not related to the fixSami Merila2011-03-151-12/+16
| | * | Prevent null pointer crash when closing splitviewSami Merila2011-03-152-17/+14
| | * | QS60Style slows down layout switch by updating widgets unnecessarilySami Merila2011-03-143-22/+0
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-03-141-4/+4
| |\ \ \ | | | |/ | | |/|
| | * | Prevented infinite recursion in QPainterPath::contains().Samuel Rødal2011-03-141-4/+4
* | | | Merge earth-team into masterOlivier Goffart2011-03-155-5/+14
|\ \ \ \
| * | | | Mac Style: Compile FixMartin Petersson2011-03-141-1/+1
| * | | | Mac: Center the Window title on Cocoa.Martin Petersson2011-03-101-0/+2
| * | | | Fix corner of scroll area so it is stylable on Mac.Martin Petersson2011-03-101-1/+1
| * | | | Windows: Activate the context menu on tray icons when shown.Martin Petersson2011-03-101-0/+1
| * | | | Do not handle posted events in QSplashScreen.Denis Dzyubenko2011-03-032-4/+10
* | | | | 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-144-7/+40
| | | |\ \ \
| | | * | | | 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-1414-55/+187
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master-upstream'Thierry Bastian2011-03-1077-207/+2871
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-1533-228/+320
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added QMdiArea::tabsMovable and tabsClosableJ-P Nurmi2011-02-103-1/+94
| * | | | | | | | | | Merge branch 'master-upstream'Gabriel de Dietrich2011-02-0878-1766/+3195
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-201148-1393/+1518
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Enable the widthForHeight() test case.Jan-Arve Saether2011-01-191-1/+1
| * | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-252-28/+33
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-246-69/+203
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed a double selection in QFileDialog when savingThierry Bastian2010-12-221-0/+1
| * | | | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-2227-731/+452
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-212-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-166-48/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-1523-206/+315
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-142-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \