summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-082-15/+34
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-082-15/+34
| |\
| | * Cocoa: p1 bug fix: fix auto test regressionsRichard Moe Gustavsen2011-04-071-5/+10
| | * Cocoa: p1 bug fix: revert use of subWindowStackingRichard Moe Gustavsen2011-04-062-15/+29
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-0715-105/+125
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-062-5/+2
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0514-99/+197
| | |\ \
| | | * | qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-051-4/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-296-13/+52
| | |\ \ \
| | * | | | Doc: Added a missing command.David Boddie2011-03-251-1/+1
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-061-0/+2
| |\ \ \ \ \
| | * | | | | Not possible to enter negative values to widgets with numeric fieldsSami Merila2011-04-061-0/+2
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-051-3/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Mac: p2 combobox regression fixRichard Moe Gustavsen2011-04-051-3/+3
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-043-5/+13
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fix QGradient stop with NaN position on Symbian.Laszlo Agocs2011-04-041-2/+4
| | * | | | | QApplication does not define flag for "single touch"Sami Merila2011-04-041-2/+7
| | * | | | | Native dialog softkeys are covered by QApplication softkeysSami Merila2011-04-041-1/+2
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-041-8/+15
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindowRichard Moe Gustavsen2011-04-041-8/+15
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-014-0/+13
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-312-5/+12
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-2913-90/+184
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-284-13/+44
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-251-0/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | qdoc: Added default values to config file for DITAMartin Smith2011-03-251-0/+3
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Doc: Update to QStyledItemDelegate::displayText()Geir Vattekar2011-03-251-0/+5
| | |/ / / / / /
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2449-197/+2136
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-2347-197/+2130
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2247-197/+2130
| | | | |\ \ \ \ \ \
| | | * | | | | | | | Doc: Small update to QImageReader/Writer::supportedImageFomrmats()Geir Vattekar2011-03-232-0/+6
| | | |/ / / / / / /
| | * | | | | | | | qdoc: Completed metadata handling.Martin Smith2011-03-241-1/+0
| | |/ / / / / / /
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-013-63/+58
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Don't display softkeys/statusbar on FS childs of non-FS windowsMiikka Heikkinen2011-04-013-63/+58
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-013-24/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Manually amend latin1 changeHarald Fernengel2011-04-011-13/+24
| | * | | | | | | | QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfe...Michael Hasselmann2011-04-011-3/+0
| | * | | | | | | | suppress warnings about ASCII to QString conversionRitt Konstantin2011-03-311-29/+15
| | * | | | | | | | take the user defined temp dir into accountRitt Konstantin2011-03-311-6/+10
| | * | | | | | | | Merge remote-tracking branch 'mainline/4.7' into 4.7Oswald Buddenhagen2011-03-3131-204/+371
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Ensure the right font is used for rendering text on MacAndy Shaw2011-03-301-1/+3
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-0625-153/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed compilation of qpixmap_raster.cppSamuel Rødal2011-04-051-1/+2
| * | | | | | | | | | Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1J-P Nurmi2011-04-051-0/+13
| * | | | | | | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one placeJiang Jiang2011-04-0520-46/+14
| * | | | | | | | | | Fix positioning in GL2 paint engine with subpixel antialiasingJiang Jiang2011-04-044-107/+11
* | | | | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-05124-823/+2831
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-051-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Add version attributes as per ODF specificationTomas Straupis2011-03-291-0/+2
| * | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-0334-183/+340
| |\ \ \ \ \ \ \ \ \ \ \