summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-05-17156-2652/+2652
|\
| * Update licenseheader text in source filesJyri Tahtela2011-05-13156-2652/+2652
* | 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
| |/
* | Don't crash on an invalid replacementStart from an input method.Andrew den Exter2011-05-121-1/+3
|/
* 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 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
* | 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-03-281-5/+0
|\ \ \
| * | | Symbian: QComboBox popup Listbox size is not adjustedSami Merila2011-03-251-5/+0
| * | | Remove changes from fix to QTBUG-17045 that were not related to the fixSami Merila2011-03-151-12/+16
| * | | Prevent null pointer crash when closing splitviewSami Merila2011-03-151-16/+12
| |/ /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-1/+5
|\ \ \ | | |/ | |/|
| * | Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode.Andrew den Exter2011-03-111-1/+5
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7David Boddie2011-03-215-5/+8
|\ \
| * | Doc: Typo fixesThorbjørn Lindeijer2011-03-144-4/+4
| * | Doc: Cannot alter SelectionMode of a combobox's viewGeir Vattekar2011-03-101-1/+4
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-091-1/+1
|\ \ \ | |/ / |/| / | |/
| * Position the TextInput cursor correctly after IM text is commited.Andrew den Exter2011-03-031-1/+1
* | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-281-1/+1
|\ \ | |/
| * Fix QPlainTextEdit corruption/crash with scrollingmae2011-02-231-1/+1
* | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-232-0/+4
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-182-0/+4
| |\
| | * Update the input context when the pre-edit cursor position changes.Andrew den Exter2011-02-162-0/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-20/+19
| |\ \ | | |/ | |/|
* | | Merge branch 'mimir' into 4.7David Boddie2011-02-231-29/+7
|\ \ \
| * | | qdoc: Added the \caption command.Martin Smith2011-01-131-4/+3
| * | | qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-121-29/+8
| * | | Merge branch '4.7' into mimirDavid Boddie2010-12-155-2/+17
| |\ \ \
* | \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-041-2/+5
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Bea Lam2011-01-271-4/+12
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19156-166/+166
| |\ \ \ \
| * | | | | Don't crash if cursor at the end.Alan Alpert2011-01-111-1/+4
| * | | | | Fix word selection in QLineControlAlan Alpert2011-01-101-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2011-01-281-4/+12
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | QComboBox popup incorrectly opened in Sym^3Sami Merila2011-01-261-4/+12
| | |/ / | |/| |
* | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13156-166/+166
|\ \ \ \ | |/ / /
| * | | Update copyright year to 2011.Jason McDonald2011-01-10156-156/+156
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-079-9/+9
| |\ \ \
| | * | | Doc: Fixing typoSergio Ahumada2011-01-079-9/+9
| | |/ /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-12-211-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fixed QStatusBar not to repaint itself too earlyDenis Dzyubenko2010-12-201-1/+1
* | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-155-2/+17
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-141-1/+1
| |\ \ | | |/