| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894 | Thomas Hartmann | 2010-09-15 | 1 | -2/+3 |
|
|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-09-14 | 2 | -1/+9 |
|\ |
|
| * | Completing the interface for children/data/resources | Thomas Hartmann | 2010-09-14 | 2 | -1/+9 |
|
|
* | | QGraphicsWidget update issues with ItemHasNoContents + effect | Bjørn Erik Nilsen | 2010-09-14 | 1 | -2/+3 |
|/ |
|
* | Assertion calledEmitUpdated fails in QGraphicsScene. | Bjørn Erik Nilsen | 2010-09-13 | 1 | -1/+1 |
|
|
* | Fix a regression where setPreferredSize(QSize(100, -1)) did not work. | Jan-Arve Sæther | 2010-09-10 | 1 | -1/+1 |
|
|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-09-02 | 1 | -3/+0 |
|\ |
|
| * | Minor performance improvement to QGraphicsItem::update. | Bjørn Erik Nilsen | 2010-09-02 | 1 | -3/+0 |
|
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-09-01 | 2 | -49/+16 |
|\ \
| |/ |
|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-08-30 | 2 | -49/+16 |
| |\ |
|
| | * | Doc: Whitespace fixes. | David Boddie | 2010-08-27 | 1 | -3/+3 |
|
|
| | * | doc: Fixed numerous qdoc warnings. | Martin Smith | 2010-08-27 | 2 | -52/+19 |
|
|
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-27 | 3 | -15/+11 |
|\ \ \
| |/ / |
|
| * | | Make sure propagated font in QGraphicsWidget can be set on a QPainter | Eskil Abrahamsen Blomfeldt | 2010-08-27 | 2 | -1/+6 |
|
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-08-27 | 1 | -7/+3 |
| |\ \
| | |/
| |/| |
|
| | * | Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition. | Bjørn Erik Nilsen | 2010-08-25 | 1 | -7/+3 |
|
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-08-25 | 1 | -7/+2 |
| |\ \
| | |/
| |/| |
|
| | * | Fixed touch event delivery in QGraphicsView. | Denis Dzyubenko | 2010-08-23 | 1 | -7/+2 |
|
|
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-24 | 2 | -2/+6 |
|\ \ \
| |/ / |
|
| * | | QGraphicsView: Fix assert that may occurs if there are 'empty' item to draw, ... | Olivier Goffart | 2010-08-24 | 1 | -1/+3 |
| |/ |
|
| * | QGraphicsView: fix few artefacts that can appear if the changed() signal is c... | Olivier Goffart | 2010-08-20 | 1 | -1/+3 |
|
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-17 | 7 | -23/+332 |
|\ \
| |/ |
|
| * | Properly emit geometryChanged() when the position change. | Alexis Menard | 2010-08-12 | 1 | -1/+2 |
|
|
| * | Merge branch 'hfw_2nd' into 4.7 | Jan-Arve Sæther | 2010-08-11 | 6 | -15/+322 |
| |\ |
|
| | * | Fix (implement!) hfw/wfh in QGridLayoutEngine | Jan-Arve Sæther | 2010-08-10 | 4 | -13/+318 |
|
|
| | * | Fixed a bug in implementation of sizeHint() when there was a constraint | Jan-Arve Sæther | 2010-08-10 | 2 | -2/+4 |
|
|
| * | | Layout items had the wrong size if the layout was resized to maximum. | Jan-Arve Sæther | 2010-08-11 | 1 | -7/+8 |
|
|
* | | | Doc: Reworded a brief description for clarity. | David Boddie | 2010-08-17 | 1 | -2/+2 |
|/ / |
|
* | | Merge remote branch 'origin/4.7' into oslo-staging-2/4.7 | Olivier Goffart | 2010-08-09 | 2 | -0/+33 |
|\ \ |
|
| * | | doc: Fixed some qdoc errors. | Martin Smith | 2010-08-06 | 2 | -0/+33 |
|
|
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-06 | 1 | -0/+5 |
|\ \ \
| |/ / |
|
| * | | Make sure onFocusChanged is correctly emitted for items in a FocusScope. | Michael Brasser | 2010-08-05 | 1 | -0/+5 |
|
|
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-08-05 | 1 | -0/+5 |
|\ \ \
| |/ / |
|
| * | | Don't crash if an item is removed from the scene while it is gaining focus. | Martin Jones | 2010-08-04 | 1 | -0/+5 |
|
|
* | | | Doc: Fixed qdoc warnings. | David Boddie | 2010-08-05 | 2 | -0/+39 |
|/ / |
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-07-30 | 2 | -3/+9 |
|\ \ |
|
| * | | Remove use of shared NOTIFY signals in QGraphicsScale | Martin Jones | 2010-07-29 | 2 | -3/+9 |
|
|
* | | | Fixed spelling mistakes in documented functions, classes, etc. Part of QTBUG-... | Jerome Pasion | 2010-07-29 | 1 | -3/+3 |
|/ / |
|
* | | Check the gesturemanager pointer before accessing it. | Denis Dzyubenko | 2010-07-27 | 1 | -3/+4 |
|
|
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-07-23 | 1 | -0/+1 |
|\ \ |
|
| * | | doc: Added missing \since 4.7 to effect propertyu. | Martin Smith | 2010-07-23 | 1 | -0/+1 |
|
|
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-07-21 | 2 | -0/+13 |
|\ \ \
| |/ /
|/| | |
|
| * | | QML focus API updates. | Michael Brasser | 2010-07-21 | 2 | -0/+13 |
|
|
* | | | QGraphicsItem: Animation leaves drawing artifacts when clipping is used. | Bjørn Erik Nilsen | 2010-07-20 | 1 | -1/+6 |
|/ / |
|
* | | Merge remote branch 'origin/4.7' into 4.7-from-4.6 | Rohan McGovern | 2010-07-17 | 1 | -1/+2 |
|\ \ |
|
| * \ | Merge remote branch 'origin/4.7' into oslo-staging-1 | Aaron McCarthy | 2010-07-16 | 2 | -8/+6 |
| |\ \
| | |/ |
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-07-14 | 1 | -1/+2 |
| |\ \ |
|
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-07-10 | 1 | -1/+2 |
| | |\ \ |
|
| | | * | | doc: Fixed several qdoc warnings. | Martin Smith | 2010-07-09 | 1 | -1/+2 |
|
|
* | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-07-16 | 2 | -7/+34 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|