summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-113-8/+40
|\
| * ShortcutOverride has no effect on some shortcuts on Mac OS X (Cocoa).Prasanth Ullattil2010-11-112-8/+36
| * Fix restore of maximized window geometry on WindowsMorten Johan Sørvig2010-11-111-0/+4
* | Fix for font engines that don't support subpixel positioningJiang Jiang2010-11-113-5/+20
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-105-8/+14
|\
| * Fix warningsOlivier Goffart2010-11-101-4/+4
| * Support glyph subpixel positioning without subpixel renderingJiang Jiang2010-11-104-4/+10
* | Update the text cursor's position for input method events.Pierre Rossi2010-11-102-0/+4
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-063-88/+86
|\
| * QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetS...Olivier Goffart2010-11-052-85/+74
| * QStyleSheetStyle: add a way to style the up arrowOlivier Goffart2010-11-051-0/+4
| * Fix QMenu rendering in the unified toolbarFabien Freling2010-11-051-3/+8
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-061-18/+20
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-051-18/+20
| |\ \ | | |/ | |/|
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-051-18/+20
| | |\
| | | * Optimize and clean up QClipData::fixup()Andreas Kling2010-11-041-18/+20
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-057-29/+55
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-053-2/+35
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-043-2/+35
| | |\ \ \
| | | * | | Added environment variable for style overriding.Dominik Holland2010-11-021-2/+10
| | | * | | Cleanup Meego Compositor detectionHarald Fernengel2010-11-022-28/+18
| | | * | | Added Maemo 6 to the X11 desktopEnvironment listDominik Holland2010-11-022-0/+35
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-051-8/+17
| |\ \ \ \ \
| | * | | | | Prevent excessive seeks in xbm detectionHarald Fernengel2010-11-041-8/+17
| | |/ / / /
| * | | | | Remove code changes that were NOT intended as part of the fixSami Merila2010-11-042-19/+0
| * | | | | Wordwrap QInputDialog label in SymbianJanne Koskinen2010-11-041-0/+3
| |/ / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-052-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix compilation issue for the Carbon build.Fabien Freling2010-11-042-1/+4
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-043-34/+40
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-043-34/+40
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-031-4/+6
| | |\ \
| | | * | The lastCenterPoint should be equal to centerPoint for new gestures.Frederik Gladhorn2010-11-031-3/+5
| | | * | PinchGesture: lastRotationAngle should start at 0.Frederik Gladhorn2010-11-031-1/+1
| | | |/
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-032-30/+34
| | |\ \
| | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-013-6/+6
| | | |\ \ | | | | |/
| | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-301-0/+3
| | | |\ \
| | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-298-12/+104
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2728-48/+98
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-259-26/+150
| | | |\ \ \ \ \
| | | * | | | | | Doc: Moved QFileSystemModel example code to the class documentation.David Boddie2010-10-212-30/+34
* | | | | | | | | Update the offsets of the QToolBars insideFabien Freling2010-11-044-8/+36
|/ / / / / / / /
* | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-034-3/+25
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-034-3/+25
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Qt/Symbian: QInputDialog layout and size are wrongSami Merila2010-11-034-3/+25
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0323-46/+149
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add member-swap to shared datatypes that don't have it.Marc Mutz2010-11-0321-0/+96
| * | | | | | | Containers: add member-swapMarc Mutz2010-11-032-0/+17
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-11-02111-126/+11425
| |\ \ \ \ \ \ \
| * | | | | | | | Fixes: Reading and writing PNG iTXt international text chunksaavit2010-11-021-27/+31
| * | | | | | | | Fixes: corruption of whitespace in text fields when reading PNG imagesaavit2010-10-291-19/+5