summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-02-108-17/+73
|\
| * Revert part of commit 7c1ab9b6a8Olivier Goffart2011-02-092-17/+2
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-049-19/+90
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-042-5/+9
| | |\
| | | * Fix few QFileDialog static method issues in Symbian^3Miikka Heikkinen2011-02-022-5/+9
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-037-15/+82
| | |\ \
| | | * | Add a mouseSelectionMode property to TextEdit and TextInput.Andrew den Exter2011-02-013-4/+30
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-297-11/+52
| | | |\ \ | | | | |/ | | | |/|
| | | | * Add support for line spacing in Text element.Yann Bodson2011-01-282-3/+19
| | | | * Don't crash when appending a null itemAaron Kennedy2011-01-271-5/+7
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-2713-59/+648
| | | | |\
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191147-1318/+1286
| | | | |\ \
| | | | * | | Don't crash if cursor at the end.Alan Alpert2011-01-111-1/+4
| | | | * | | Disable dragging text in TextEdit.Andrew den Exter2011-01-113-1/+21
| | | | * | | Fix word selection in QLineControlAlan Alpert2011-01-101-2/+2
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-02-091-38/+36
|\ \ \ \ \ \ \
| * | | | | | | Cocoa: Mouse-grabbing in pop-up menus on OS X isn't workingRichard Moe Gustavsen2011-02-081-8/+13
| * | | | | | | Alien/Cocoa: popups in creator does not always work for press'n'holdRichard Moe Gustavsen2011-02-081-30/+23
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-02-074-9/+38
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix builds with compilers without --with-fpu=neon as a default.Robin Burchell2011-02-041-4/+3
| * | | | | | | Improve performance of partial updates in raster window surface on X11.Samuel Rødal2011-02-032-2/+30
| * | | | | | | Fixed MIT-SHM errors in QNativeImage.Samuel Rødal2011-02-031-3/+5
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-032-3/+8
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Carefull free the data from XGetWindowProperty on X11.Denis Dzyubenko2011-02-021-1/+3
| * | | | | | | Fixes memory leaks in QX11EmbedDenis Dzyubenko2011-02-021-2/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7Olivier Goffart2011-02-034-3/+23
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'integration'Yoann Lopes2011-02-024-3/+23
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fixes lastResortFamily() on Symbian when using FreeType.Yoann Lopes2011-01-311-2/+16
| | * | | | | Fixes compilation when using FreeType on Symbian.Yoann Lopes2011-01-313-1/+7
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-014-4/+60
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Orientation control implementation for Symbianmread2011-01-272-0/+42
| | |_|_|/ | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-261-0/+6
| |\ \ \ \
| | * | | | Fix: define hotSpot for Gestures on MacZeno Albisser2011-01-261-0/+6
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-261-4/+12
| |\ \ \ \ \
| | * | | | | QComboBox popup incorrectly opened in Sym^3Sami Merila2011-01-261-4/+12
| | |/ / / /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-01-281-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'qt-fire-review/master'aavit2011-01-281-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.Samuel Rødal2011-01-261-1/+1
* | | | | | | Cocoa/Alien: fix qgraphicseffectsource autotestRichard Moe Gustavsen2011-01-281-5/+8
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-2725-1303/+1773
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-2625-1303/+1773
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Cocoa: non-native toolbar shows in window when hiddenRichard Moe Gustavsen2011-01-251-1/+4
| | * | | | | Cocoa: disable scroll optimization for certain casesRichard Moe Gustavsen2011-01-252-6/+8
| | * | | | | Merge remote branch 'qt-water-staging/master' into alien-merged-mainlineRichard Moe Gustavsen2011-01-255-227/+283
| | |\ \ \ \ \
| | * | | | | | Cocoa: fix scroll optimization bugRichard Moe Gustavsen2011-01-243-3/+4
| | * | | | | | Cocoa: add scroll optimization when scrolling both hor and verRichard Moe Gustavsen2011-01-244-0/+70
| | * | | | | | Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4Richard Moe Gustavsen2011-01-242-4/+2
| | * | | | | | Cocoa: remove compiler warningRichard Moe Gustavsen2011-01-241-2/+1
| | * | | | | | Add support for disabling touch on to enhance scrolling in CocoaRichard Moe Gustavsen2011-01-248-11/+49
| | * | | | | | Cocoa/Alien: replace depricated APIRichard Moe Gustavsen2011-01-211-1/+1