summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-05-175-4/+16
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-134-3/+13
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-05-123-3/+1
| | |\
| | | * Clear confusion between QMainWindow and QMainWindowLayout.Fabien Freling2011-05-123-3/+1
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-05-121-0/+12
| | |\ \
| | | * | Fix for rounded corners bug in QMenuJani Hautakangas2011-05-121-0/+12
| | | |/
| * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-121-1/+3
| |\ \ \ | | |/ /
| | * | Don't crash on an invalid replacementStart from an input method.Andrew den Exter2011-05-121-1/+3
| | |/
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-174-11/+12
|\ \ \
| * | | Move QTextCursor::MoveStyle to Qt namespaceJiang Jiang2011-05-114-11/+12
| |/ /
* | | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-162-108/+1
|/ /
* | Merge remote-tracking branch 'origin/4.8'Olivier Goffart2011-05-051-0/+5
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-05-041-0/+5
| |\ \
| | * | Fix insert and scroll to bottom casemae2011-04-261-0/+5
* | | | Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.Robin Burchell2011-05-052-18/+33
|/ / /
* | | Merge earth-team into origin/4.8Olivier Goffart2011-05-038-46/+136
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-04-296-38/+83
| |\ \ \
| | * \ \ Merge branch '4.8-upstream'Thierry Bastian2011-04-281-2/+10
| | |\ \ \
| | * | | | Make QLineControl send accessibility updates.Frederik Gladhorn2011-04-274-3/+11
| | * | | | Merge branch 'master-upstream'Thierry Bastian2011-04-196-57/+35
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Totally kill MR 916Gabriel de Dietrich2011-04-1511-779/+385
| | * | | | Reverting merge request 916Gabriel de Dietrich2011-04-147-58/+70
| | * | | | Reverting merge request 916Gabriel de Dietrich2011-04-142-1/+3
| | * | | | Build fix on QMenuBarThierry Bastian2011-04-142-3/+1
| | * | | | Fix copyright and a few codestyle mistakesThierry Bastian2011-04-143-114/+113
| | * | | | Renamed QAbstractMenuBarImpl to QAbstractMenuBarInterfaceAurélien Gâteau2011-04-145-14/+14
| | * | | | Make ctor and dtor of QAbstractMenuBarImpl inlineAurélien Gâteau2011-04-143-47/+3
| | * | | | QAbstractMenuBarImpl::allowSetVisible => setVisibleAurélien Gâteau2011-04-144-14/+6
| | * | | | Introduce menubar plugin systemAurélien Gâteau2011-04-144-1/+41
| | * | | | Introduce QAbstractMenuBarImplAurélien Gâteau2011-04-147-299/+694
| | * | | | Hide Q<Platform>MenuActionAurelien Gateau2011-04-145-10/+10
| | * | | | Fix warning about initialization orderAurélien Gâteau2011-04-141-3/+3
| | * | | | Fix a bug with menu overflowing from a lower resolution second screen.Pierre Rossi2011-04-112-14/+51
| | * | | | Calculate the submenu position after emitting aboutToShow()Pierre Rossi2011-04-111-21/+21
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-04-284-6/+43
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Support visual cursor movement for BIDI textJiang Jiang2011-04-194-6/+43
| | | |/ / | | |/| |
| * | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-04-221-1/+9
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-211-1/+9
| | |\ \ \
| | | * | | Fix TextInput cursor position unchanged when selection length is 0.Andrew den Exter2011-04-211-1/+9
| * | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-211-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-201-1/+1
| | |\ \ \ | | | |/ /
| | | * | Fix excessive scrolling in TextInput with mid string pre-edit text.Andrew den Exter2011-04-191-1/+1
| | * | | Fix build of Qt/DirectFB without graphics view support.Denis Oliver Kropp2011-04-181-0/+2
* | | | | Fixes warnings about unused variablesOlivier Goffart2011-04-285-8/+1
|/ / / /
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-3/+3
|\ \ \ \ | |/ / /
| * | | 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 remote branch 'qt-master/master'Guoqing Zhang2011-04-0510-45/+40
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-316-39/+15
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-281-5/+0
| | |\ \ \