Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge earth-team into origin/4.8 | Olivier Goffart | 2011-05-03 | 1 | -2/+2 |
|\ | |||||
| * | Typos in internal api docs. | Frederik Gladhorn | 2011-04-22 | 1 | -2/+2 |
* | | Fixes warnings about unused variables | Olivier Goffart | 2011-04-28 | 2 | -6/+2 |
|/ | |||||
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 2 | -4/+1 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-04-06 | 1 | -1/+1 |
| |\ | |||||
| | * | Doc: Added a missing command. | David Boddie | 2011-03-25 | 1 | -1/+1 |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 5 | -12/+38 |
| | |\ | |||||
| * | \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-04-01 | 1 | -3/+0 |
| |\ \ \ | |||||
| | * | | | QGraphicsItem::ItemStops[ClickFocusProgration|FocusHandling] must not interfe... | Michael Hasselmann | 2011-04-01 | 1 | -3/+0 |
* | | | | | Draw graphics item bounding rects drawn when QT_DRAW_SCENE_ITEM_RECTS=1 | J-P Nurmi | 2011-04-05 | 1 | -0/+13 |
* | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-01 | 2 | -2/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-01 | 2 | -2/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Rotation transform with NaN angle can cause crash | Martin Jones | 2011-03-30 | 1 | -1/+3 |
| | * | | | Fix width of TextInput micro focus rectangle. | Andrew den Exter | 2011-03-30 | 1 | -1/+1 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 2 | -10/+12 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-22 | 5 | -12/+38 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | |||||
| * | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer... | David Boddie | 2011-02-23 | 1 | -12/+11 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-02-23 | 1 | -9/+11 |
| |\ \ \ | |||||
| | * | | | Doc: Work on QGraphicsItem::ItemSceneChange/ItemSceneHasChanged | Geir Vattekar | 2011-02-23 | 1 | -9/+11 |
| * | | | | Merge branch 'mimir' into 4.7 | David Boddie | 2011-02-23 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | qdoc: Fixed some validation errors in the DITA files | Martin Smith | 2011-01-19 | 1 | -1/+1 |
| | * | | | Merge branch '4.7' into mimir | David Boddie | 2010-12-15 | 6 | -14/+23 |
| | |\ \ \ | |||||
* | | \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-17 | 4 | -8/+26 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int... | Qt Continuous Integration System | 2011-03-16 | 4 | -8/+26 |
| |\ \ \ \ \ | |||||
| | * | | | | | Introduce QGraphicsItem::ItemStopsFocusHandling flag | Michael Hasselmann | 2011-03-16 | 4 | -8/+26 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-03-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-15 | 3 | -22/+23 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-08 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2011-01-20 | 51 | -53/+54 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Enable the widthForHeight() test case. | Jan-Arve Saether | 2011-01-19 | 1 | -1/+1 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 3 | -4/+12 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-10 | 3 | -4/+12 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | Fix QGraphicsScene returning incorrect focus item. | Yoann Lopes | 2011-03-10 | 3 | -4/+12 |
* | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 2 | -17/+16 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-02-10 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Stop focus propagation of touch events when flag is set. | Niklas Kurkisuo | 2011-02-09 | 1 | -0/+4 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-09 | 1 | -12/+7 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | Don't clear pre-edit text when a graphics items loses focus. | Andrew den Exter | 2011-02-09 | 1 | -12/+7 |
| * | | | | | | | | Doc: Fixed warnings and other problems found while fixing markup. | David Boddie | 2011-02-07 | 1 | -3/+3 |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-02-04 | 1 | -5/+7 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-01-26 | 2 | -5/+5 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 51 | -52/+54 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-16 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 6 | -14/+23 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| * | | | | | | | | | Doc: Used div elements for floats, updated the style sheet. | David Boddie | 2010-12-14 | 1 | -1/+3 |
| * | | | | | | | | | Doc: Changed floating images to use the new float qdoc macros. | David Boddie | 2010-12-13 | 1 | -3/+1 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 1 | -5/+7 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Don't crash when appending a null item | Aaron Kennedy | 2011-01-27 | 1 | -5/+7 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-25 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Merge branch '4.7-review' into 4.7-staging | Thierry Bastian | 2011-01-17 | 1 | -2/+3 |
| |\ \ \ \ \ \ |