| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -127/+149 |
| |\ |
|
| | * | Fix horizontal alignment of QTextDocument-based RTL text | Joona Petrell | 2011-03-09 | 1 | -14/+31 |
|
|
| | * | Revert to previous lineHeight behavior. | Martin Jones | 2011-03-09 | 1 | -0/+1 |
|
|
| | * | Use the text layout bounds calculated by QLayout. | Martin Jones | 2011-03-08 | 1 | -45/+28 |
|
|
| | * | Base empty QML editor horizontal alignment on QApplication::keyboardInputDire... | Joona Petrell | 2011-03-08 | 1 | -1/+2 |
|
|
| | * | Reverse horizontal alignment of QML editors when the layout mirroring is enabled | Joona Petrell | 2011-03-07 | 1 | -29/+66 |
|
|
| | * | Removal of text alignment layout direction dependency was missing couple of c... | Joona Petrell | 2011-03-04 | 1 | -2/+0 |
|
|
| | * | Fix RTL multiline Text drawing | Martin Jones | 2011-03-04 | 1 | -55/+20 |
|
|
| | * | Remove text alignment of empty QML editors following the layout direction | Joona Petrell | 2011-03-04 | 1 | -4/+1 |
|
|
| | * | Merge branch '4.7' into qtquick11 | Martin Jones | 2011-03-01 | 1 | -7/+32 |
| | |\ |
|
| | * | | Make sure horizontal QML editor text aligment always returns the actual align... | Joona Petrell | 2011-03-01 | 1 | -22/+45 |
|
|
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 1 | -0/+4 |
| |\ \ \
| | |/
| |/| |
|
| | * | | fix/improve docs for new QtQuick 1.1 attributes | Bea Lam | 2011-02-28 | 1 | -0/+4 |
|
|
| * | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 1 | -11/+34 |
| |\ \ \
| |/ / |
|
| | * | | 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 | -5/+7 |
| | |\ \
| | |/ |
|
| | | * | Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from m... | Yann Bodson | 2011-02-09 | 1 | -5/+7 |
|
|
| | * | | 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 | 1 | -7/+28 |
| | |\ \
| | |/
| |/| |
|
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-01-26 | 1 | -4/+13 |
| | | |\ |
|
| | | * | | Doc: Fixed the syntax of QML code snippets. | David Boddie | 2011-01-24 | 1 | -7/+28 |
|
|
| * | | | | Revert part of commit 7c1ab9b6a8 | Olivier Goffart | 2011-02-09 | 1 | -23/+0 |
| |/ / / |
|
| * | | | Doc fix for lineHeight. | Yann Bodson | 2011-01-28 | 1 | -1/+3 |
|
|
| * | | | Add support for line spacing in Text element. | Yann Bodson | 2011-01-28 | 1 | -3/+81 |
|
|
| * | | | Fixing right-to-left text in Text and TextInput | Christopher Ham | 2011-01-28 | 1 | -6/+18 |
|
|
| * | | | Fix MaximumLineCount in Text and add tests | Christopher Ham | 2011-01-28 | 1 | -24/+20 |
|
|
| * | | | Expose implicitWidth and implicitHeight properties of Item. | Martin Jones | 2011-01-24 | 1 | -6/+56 |
|
|
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 1 | -5/+14 |
| |\ \ \
| | |/
| |/| |
|
| | * | | Request font sizes with only 0.5pt resolution. | Martin Jones | 2011-01-18 | 1 | -4/+13 |
| | |/ |
|
| | * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1 | -1/+1 |
|
|
| * | | Add lineCount property to QDeclarativeTextEdit | Christopher Ham | 2011-01-14 | 1 | -1/+1 |
|
|
| * | | QDeclarativeText has new multiline properties | Christopher Ham | 2011-01-14 | 1 | -15/+164 |
|
|
| * | | Support for justification in Text and TextEdit elements. | Yann Bodson | 2010-12-17 | 1 | -4/+7 |
| |/ |
|
| * | Repaint when text color changes | Alan Alpert | 2010-11-26 | 1 | -5/+6 |
|
|
| * | Fix Text::elide docs. | Bea Lam | 2010-11-09 | 1 | -1/+1 |
|
|
| * | Text alignment is broken with multi-line text and implicit size. | Yann Bodson | 2010-11-08 | 1 | -12/+46 |
|
|
| * | Regression: QDeclarativeText does not update when text turns empty | Yann Bodson | 2010-11-03 | 1 | -0/+1 |
|
|
| * | Regression: Text element breaks when using \n for separating lines | Yann Bodson | 2010-11-02 | 1 | -12/+12 |
|
|
| * | Regression: horizontal alignment bug with single line text | Yann Bodson | 2010-10-29 | 1 | -3/+3 |
|
|
| * | Update when text changes to "" | Alan Alpert | 2010-10-29 | 1 | -1/+2 |
|
|
| * | Remove unnecessary layouting code from QDeclarativeText | Yann Bodson | 2010-10-28 | 1 | -43/+8 |
|
|
| * | Actually call update in the Text Element | Alan Alpert | 2010-10-15 | 1 | -0/+1 |
|
|
| * | Recalculate Text Element's alignment when width changes | Alan Alpert | 2010-10-15 | 1 | -3/+4 |
|
|
| * | Fix alignment bugs in Text element | Aaron Kennedy | 2010-10-13 | 1 | -456/+501 |
|
|
| * | Disable Text {} image caching by default | Aaron Kennedy | 2010-10-08 | 1 | -2/+2 |
|
|
| * | Fix clipping behavior for non-cached text. | Michael Brasser | 2010-10-04 | 1 | -1/+1 |
|
|
| * | Apply the QStaticText text-caching strategy for QML | Aaron Kennedy | 2010-10-01 | 1 | -12/+24 |
|
|
| * | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-09-09 | 1 | -10/+8 |
| |\ |
|
| | * | Don't cause repaints during painting in Text element | Martin Jones | 2010-09-08 | 1 | -9/+7 |
|
|
| | * | Doc: Added types to method and signal documentation; other fixes. | David Boddie | 2010-09-01 | 1 | -1/+1 |
|
|
| * | | Clarified iterator semantic in documentation and added a code snippet to a QM... | Jerome Pasion | 2010-08-31 | 1 | -0/+10 |
| |/ |
|
| * | Remove pointless \internal docs (that contain no information) | Aaron Kennedy | 2010-08-27 | 1 | -26/+0 |
|
|
