summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-151-1/+1
|\
| * doc: Fix documentation of QTextEdit::setDocumentEskil Abrahamsen Blomfeldt2010-11-151-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-152-2/+9
|\ \ | |/ |/|
| * Crash fix, when the Object will be deleted during handling a QGestureEvent.Dominik Holland2010-11-122-2/+9
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-121-2/+1
|\ \ | |/ |/|
| * Don't set -mfpu=neon globally if the compiler supports neon.Samuel Rødal2010-11-111-2/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2010-11-114-77/+157
|\ \ | |/ |/|
| * Doc: Fixing typoSergio Ahumada2010-11-111-1/+1
| * Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-093-1/+91
| |\
| * | QS60Style: Color calculation should be optimizedSami Merila2010-11-092-5/+5
| * | QS60Style: Color calculation should be optimizedSami Merila2010-11-093-59/+130
| * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-057-29/+55
| |\ \
| * \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-047-37/+65
| |\ \ \
| * | | | With some locales, QDoubleValidator would not accept "C" locale valid numbersGabriel de Dietrich2010-11-021-18/+27
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-111-1/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-101-1/+4
| |\ \ \ \ \
| | * | | | | Clear X11 structure before useHarald Fernengel2010-11-091-1/+4
| | | |_|/ / | | |/| | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-1013-26/+87
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-0913-26/+87
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Doc: Fixing typoSergio Ahumada2010-11-098-12/+12
| | * | | | Fixed tst_qwidget::testContentsPropagation auto-test failure.Samuel Rødal2010-11-091-3/+5
| | * | | | Fixed text rendering bug in raster engine when opacity != 1.0.Samuel Rødal2010-11-081-1/+3
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-055-15/+72
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-055-15/+72
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-035-15/+72
| | | | |\ \ \ | | | | | |_|/ | | | | |/| |
| | | | | * | Fixed grabWidget sometimes returning uninitialized memory.Samuel Rødal2010-11-031-2/+3
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-014-13/+69
| | | | | |\ \ | | | | | | |/ | | | | | |/|
| | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-304-13/+69
| | | | | | |\
| | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-294-13/+69
| | | | | | | |\
| | | | | | | | * Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-294-13/+69
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-091-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed random crash in QGestureManager.Dominik Holland2010-11-091-0/+4
| |/ / / / / / /
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-11-053-1/+91
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'QT-4077-fix' into 4.7-s60axis2010-11-053-1/+91
| |\ \ \ \ \ \ \
| | * | | | | | | Fixed event starvation with pointer events on Symbian.axis2010-11-053-1/+91
* | | | | | | | | 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 '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
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |