| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-23 | 1 | -8/+29 |
|\ |
|
| * | DelayRemove of list delegate on section boundary duplicated section | Martin Jones | 2011-02-23 | 1 | -8/+29 |
|
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-23 | 14 | -35/+164 |
|\ \
| |/ |
|
| * | ListView and GridView indexAt should use qreal coordinates. | Martin Jones | 2011-02-23 | 4 | -6/+6 |
|
|
| * | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7 | Joona Petrell | 2011-02-22 | 12 | -92/+157 |
| |\ |
|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-18 | 5 | -3/+46 |
| | |\ |
|
| * | | | Prevent recursion due to nested Flickables with pressDelay | Martin Jones | 2011-02-21 | 3 | -4/+46 |
|
|
| * | | | Hide the TextInput/Edit cursor when the view doesn't have focus. | Andrew den Exter | 2011-02-21 | 2 | -2/+2 |
|
|
| * | | | Forward mouse events from TextInput and TextEdit to QInputContext. | Andrew den Exter | 2011-02-21 | 3 | -20/+64 |
| | |/
| |/| |
|
| * | | Allow MouseArea to prevent mouse grab begin stolen by Flickable. | Martin Jones | 2011-02-17 | 4 | -3/+44 |
|
|
| * | | Update the input context when the pre-edit cursor position changes. | Andrew den Exter | 2011-02-16 | 1 | -0/+2 |
|
|
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-17 | 3 | -1/+17 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-15 | 1 | -0/+9 |
| |\ \
| | |/ |
|
| | * | Use QML notation for documenting TextInput::accepted() signal. | Andrew den Exter | 2011-02-15 | 1 | -4/+4 |
|
|
| | * | Document the TextInput accepted() signal. | Andrew den Exter | 2011-02-15 | 1 | -0/+9 |
|
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-14 | 2 | -1/+8 |
| |\ \
| | |/ |
|
| | * | Flickable uses the flick velocity to determine whether to retain grab | Martin Jones | 2011-02-11 | 1 | -1/+6 |
|
|
| | * | MouseArea docs - link to onCanceled() from onReleased() | Bea Lam | 2011-02-11 | 1 | -0/+2 |
|
|
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-10 | 5 | -16/+48 |
|\ \ \
| |/ / |
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-10 | 5 | -16/+48 |
| |\ \
| | |/ |
|
| | * | PathView items were not correctly updated when rootIndex changed. | Martin Jones | 2011-02-10 | 1 | -16/+28 |
|
|
| | * | Allow text to selected in a TextEdit or TextInput inside a Flickable. | Andrew den Exter | 2011-02-10 | 4 | -0/+20 |
|
|
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 17 | -157/+243 |
|\ \ \
| |/ / |
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-09 | 5 | -57/+44 |
| |\ \
| | |/ |
|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2011-02-09 | 6 | -12/+31 |
| | |\ |
|
| | | * | PathView regression: dragging the path didn't update currentIndex | Martin Jones | 2011-02-09 | 1 | -1/+1 |
|
|
| | | * | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m... | Yann Bodson | 2011-02-09 | 2 | -6/+8 |
|
|
| | * | | Call onAdd() for first items added to ListView and GridView | Bea Lam | 2011-02-09 | 2 | -50/+35 |
|
|
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-08 | 1 | -1/+11 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Scroll TextInput to ensure preedit text is visible. | Andrew den Exter | 2011-02-08 | 1 | -1/+11 |
|
|
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-02-07 | 5 | -8/+32 |
| |\ \ \
| | |/ / |
|
| | * | | Changing header/footer size during creation caused recusion | Martin Jones | 2011-02-07 | 2 | -4/+8 |
|
|
| | * | | Ensure section delegates are updated when the section property changes. | Martin Jones | 2011-02-07 | 1 | -0/+3 |
| | |/ |
|
| | * | modelChanged() should not be emitted until view is repopulated | Bea Lam | 2011-02-04 | 1 | -1/+1 |
|
|
| | * | AnimatedImage does not notify on status change. | Yann Bodson | 2011-02-04 | 2 | -3/+20 |
|
|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-02-04 | 12 | -92/+157 |
| |\ \
| | |/
| |/| |
|
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-01-26 | 12 | -67/+97 |
| | |\ |
|
| | * | | Doc: Fixed the syntax of QML code snippets. | David Boddie | 2011-01-24 | 5 | -33/+65 |
|
|
| | * | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2011-01-21 | 80 | -164/+199 |
| | |\ \ |
|
| | | * | | Doc: Fixed QML syntax. | David Boddie | 2011-01-19 | 2 | -15/+23 |
|
|
| | | * | | Doc: Fixed invalid/incomplete QML code snippets. | David Boddie | 2011-01-17 | 3 | -11/+18 |
|
|
| | | * | | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 80 | -146/+175 |
| | | |\ \ |
|
| | | * \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-20 | 2 | -0/+4 |
| | | |\ \ \ |
|
| | * | | | | | Doc: Fixed the syntax of QML code snippets. | David Boddie | 2011-01-21 | 1 | -7/+7 |
|
|
| | * | | | | | Doc: Fixed invalid QML snippets and marked up JavaScript correctly. | David Boddie | 2011-01-20 | 1 | -33/+64 |
| | |/ / / / |
|
| | * | | | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 8 | -24/+51 |
| | |\ \ \ \ |
|
| | * | | | | | Doc: Fixed an old-style float. | David Boddie | 2010-12-15 | 1 | -1/+3 |
|
|
| | * | | | | | Doc: Used div elements for floats, updated the style sheet. | David Boddie | 2010-12-14 | 4 | -8/+24 |
|
|
| | * | | | | | Doc: Changed floating images to use the new float qdoc macros. | David Boddie | 2010-12-13 | 4 | -27/+9 |
|
|
* | | | | | | | Revert part of commit 7c1ab9b6a8 | Olivier Goffart | 2011-02-09 | 1 | -23/+0 |
|
|