summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2010-01-131-7/+14
|\
| * Fixes a crash when setting focus on a widget with a focus proxy.Denis Dzyubenko2010-01-061-6/+13
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* | Merge branch '4.6'Thiago Macieira2010-01-081-4/+10
|\ \ | |/
| * doc: Added note explaining grabMouse() for Cocoa and Carbon.Martin Smith2010-01-051-4/+10
* | Merge branch '4.6'Thiago Macieira2010-01-051-6/+5
|\ \ | |/
| * Fixes crash when widget with WA_StaticContents child become toplevel.Olivier Goffart2009-12-291-6/+5
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integr...Qt Continuous Integration System2009-12-091-0/+2
| |\
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integr...Qt Continuous Integration System2009-12-081-10/+4
| |\ \
* | \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-151-10/+6
|\ \ \ \
| * \ \ \ Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-10/+6
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Doc: Explicitly mention that QWidget/QGraphicsItem takes ownership of effects.Bjørn Erik Nilsen2009-12-081-0/+2
| | |/
| | * Fixed memory leaks when removing a QGraphicsEffect from a QGraphicsItem or QW...Yoann Lopes2009-12-071-10/+4
* | | Merge commit 'oslo-staging-1/4.6' into master-mainlineRichard Moe Gustavsen2009-12-041-1/+3
|\ \ \ | |/ /
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-staging1Denis Dzyubenko2009-12-031-2/+8
| |\ \ | | |/
| * | Do not emulate mouse event out of touch pad eventsDenis Dzyubenko2009-12-021-1/+3
* | | Merge branch '4.6'Thiago Macieira2009-12-021-17/+23
|\ \ \ | | |/ | |/|
| * | Clarify the docs a bit when setting focus.axis2009-12-011-2/+8
| |/
| * Fixes for tab/space usage in qwidget.cpp.Janne Anttila2009-11-251-15/+15
* | Merge branch '4.6'Thiago Macieira2009-11-251-15/+20
|\ \ | |/
| * avoid possible crash when showing a modal dialog from a widget destructorThierry Bastian2009-11-201-2/+3
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-181-2/+4
| |\
| | * doc: Clarified function of setLayoutDirection()Martin Smith2009-11-171-2/+4
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-171-9/+12
| |\ \ | | |/
| | * Fix input method support on widgets that have a focus proxy set.Simon Hausmann2009-11-131-9/+12
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-131-0/+11
| |\ \ | | |/
| * | doc change: remove duplicate entry in "see also" and stray focusWidget.Christian Kamm2009-11-111-2/+1
* | | Merge branch '4.6'Thiago Macieira2009-11-131-0/+11
|\ \ \ | | |/ | |/|
| * | Code in gui/* should be completely namespacedhjk2009-11-111-4/+5
| * | Improvements to graphics effects API after review round.Samuel Rødal2009-11-111-5/+5
| * | Doc: Added an example to demonstrate the QWebElement class.David Boddie2009-11-091-0/+11
* | | Fixed QPixmap::grabWidget() on widgets that have not yet been shown.Kim Motoyoshi Kalland2009-11-121-84/+92
| |/ |/|
* | Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-101-4/+5
|\ \
| * | Code in gui/* should be completely namespacedhjk2009-11-091-4/+5
* | | Improvements to graphics effects API after review round.Samuel Rødal2009-11-101-5/+5
| |/ |/|
* | Doc: typo fixedJoerg Bornemann2009-11-091-1/+1
|/
* Fixed uninitialized background artifacts in QWidget::render.Samuel Rødal2009-11-061-2/+1
* Add QT_NO_GRAPHICSEFFECTJørgen Lind2009-11-041-1/+18
* Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-041-6/+7
|\
| * Gesture api review.Denis Dzyubenko2009-11-031-4/+4
| * Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-031-0/+1
| * Added QGraphicsObject::ungrabGesture()Denis Dzyubenko2009-11-031-2/+2
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-301-0/+16
| |\
* | \ Merge commit 'origin/4.6' into featureJørgen Lind2009-11-021-15/+41
|\ \ \
| * \ \ Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-0/+16
| |\ \ \ | | | |/ | | |/|
| | * | Add QWidget::ungrabGestureThomas Zander2009-10-261-0/+16
| * | | Merge commit 'widget/4.6' into origin/4.6Olivier Goffart2009-10-301-13/+9
| |\ \ \ | | |_|/ | |/| |
| | * | Wrong caching of opaque children in QWidget.Bjørn Erik Nilsen2009-10-281-13/+9
| | |/
| * | Options on how to get a pixmap from an effect sourceGunnar Sletta2009-10-271-2/+16
| |/
* | Fix GRAPHICSVIEWJørgen Lind2009-10-291-11/+29