summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2673-1405/+926
|\
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-11/+8
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-251-11/+8
| | |\
| | | * Simplify calculation of center point and scale for PinchRecongizerFrederik Gladhorn2010-10-251-11/+8
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-263-3/+30
| |\ \ \
| | * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-253-3/+30
| | |\ \ \ | | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-10-253-3/+30
| | | |\ \
| | | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-233-15/+80
| | | | |\ \ | | | | | |/
| | | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-222-1/+25
| | | | |\ \
| | | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-211-0/+13
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-203-10/+32
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2022-1103/+724
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-151-0/+7
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-141-0/+7
| | | | | |\ \ \ \ \ \
| | | | * | \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-1422-113/+224
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | * | | | | | | | Doc: Fixed minor documentation issues.David Boddie2010-10-121-2/+2
| | | | * | | | | | | | Doc: Fixed documentation style and qdoc warnings.David Boddie2010-10-081-1/+1
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0813-77/+126
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-072-7/+4
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Doc: Marked some new properties as internal for now.David Boddie2010-10-071-0/+27
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-251-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a translucen...Christian Ehrlicher2010-10-251-0/+2
| * | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-2524-31/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Fixed many spelling errors.Rohan McGovern2010-10-2524-31/+31
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-2538-1345/+814
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2533-1138/+668
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-223-15/+80
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | | * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-10-221-0/+13
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-212-14/+79
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | |
| | | | * | | | | | | | | | QComboBox popup is shown in incorrect location with bottom CBASami Merila2010-10-221-1/+1
| | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | QS60Style: The QComboBox/QSpinBox text color is not according to themeSami Merila2010-10-211-4/+1
| | | | * | | | | | | | | Added include for missing file for Symbian3Titta Heikkala2010-10-211-0/+3
| | | | * | | | | | | | | Support for clipboard between Qt and Symbian applicationsTitta Heikkala2010-10-211-10/+75
| | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | * | | | | | | | | Implement QWidget::metric PdmNumColors for QWSAnders Bakken2010-10-211-0/+24
| | | * | | | | | | | | Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-211-1/+1
| | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Make sure d->ranges does not have invalid ranges before processing it.Stephen Kelly2010-10-211-0/+13
| | | |/ / / / / / /
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-201-2/+19
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fixed font rendering in manually built Qt on ARMv6.Samuel Rødal2010-10-201-2/+19
| | | * | | | | | | | Fix autotest failure with experimental client decoHarald Fernengel2010-10-201-1/+1
| | | |/ / / / / / /
| | | * | | | | | | Further focus scope fixes.Michael Brasser2010-10-191-7/+12
| | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-181-0/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | QS60Style: ComboBox disappears after orientation switchSami Merila2010-10-181-0/+2
| | | * | | | | | | Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriateJ-P Nurmi2010-10-181-1/+5
| | | |/ / / / / /
| | | * | | | | | Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Olivier Goffart2010-10-161-9/+6
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1512-62/+368
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1512-62/+368
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Disable the unified toolbar before enteringFabien Freling2010-10-153-2/+37
| | | | | * | | | | | QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-151-6/+9
| | | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1418-95/+368
| | | | | |\ \ \ \ \ \ | | | | | | |_|_|_|_|/ | | | | | |/| | | | |
| | | | | | * | | | | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-1412-52/+81
| | | | | | |\ \ \ \ \ | | | | | | | | |_|_|/ | | | | | | | |/| | |