summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream'Gabriel de Dietrich2011-02-0878-1766/+3195
|\
| * 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
| | | * | | | Cocoa/Alien: remove unneded code for scrolling with alienRichard Moe Gustavsen2011-01-211-6/+1
| | | * | | | Cocoa/Alien: keep the scrolling within correct boundsRichard Moe Gustavsen2011-01-212-26/+11
| | | * | | | Cocoa/Alien: bugfix scrolling, dirty region issueRichard Moe Gustavsen2011-01-211-45/+42
| | | * | | | Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgetsRichard Moe Gustavsen2011-01-202-5/+25
| | | * | | | Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)Richard Moe Gustavsen2011-01-191-1/+6
| | | * | | | 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 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alie...Richard Moe Gustavsen2011-01-171182-3818/+9580
| | | |\ \ \ \ \
| | | * | | | | | Alien implementation for the Cocoa portRichard Moe Gustavsen2011-01-1724-1283/+1641
| * | | | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into...Qt Continuous Integration System2011-01-2729-152/+358
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-261151-1619/+1782
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Make QGLContext::fromPlatformGLContext show correct sharingJørgen Lind2011-01-252-2/+2
| | * | | | | | | | Add Qt::Key_ScreenSaverPaul Olav Tvete2011-01-181-0/+1
| | * | | | | | | | Lighthouse: Fix keyboard modifier handlingJørgen Lind2011-01-071-5/+3
| | * | | | | | | | Lighthouse: Support external plugins.Morten Johan Sørvig2011-01-073-9/+34
| | * | | | | | | | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-052-0/+4
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Add styleHint to fallback api for fontdatabases in LighthouseJørgen Lind2011-01-044-7/+12