summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Fix insert and scroll to bottom casemae2011-04-261-0/+5
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-04-131-2/+2
|\
| * Fix warnings about && inside ||Thiago Macieira2011-04-131-2/+2
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-134-2/+12
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-124-2/+12
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-111-1/+1
| | |\ \
| | | * | Cocoa: Fixup wrong code in patch baaa5aeRichard Moe Gustavsen2011-04-111-1/+1
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-113-1/+11
| | |\ \ \
| | | * | | Make sure removed QTextBlock is invalidJiang Jiang2011-04-113-1/+11
* | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-1148-400/+332
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-092-12/+26
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-092-12/+26
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-091-9/+25
| | | |\ \ \ \
| | | | * | | | [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)Arnold Konrad2011-04-081-9/+25
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-081-3/+1
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Let's not write to the source buffer when blending argb32 on rgb16.Samuel Rødal2011-04-081-3/+1
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-...Qt Continuous Integration System2011-04-092-2/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'qa-review/master' into qa-staging-masterRohan McGovern2011-04-072-2/+2
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge qt/qt.git master into qa-team-masterRohan McGovern2011-03-24239-2800/+9572
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Update copyright year to 2011.Jason McDonald2011-01-101203-1204/+1204
| * | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-04-082-15/+34
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | 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 branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-075-135/+128
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Get rid of double conversions and arithmetic when qreal is float.Samuel Rødal2011-04-065-135/+128
| * | | | | | | | | 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
| | | |/ / / / / / / / / /